diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05c566573bcd81bde9916160dfb51cb986c1b944..63e01619ac612b1411681bc09d694d0e300e3281 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,7 +119,7 @@ find_haf_image:
     UPSTREAM_BRANCH: "develop"
     UPSTREAM_OUTPUT: "haf_image.env"
   before_script:
-    - apk add --no-cache git bash curl
+    # docker-builder image already has git, bash, and curl
     # Fetch source patterns from HAF's script (single source of truth)
     - |
       PATTERNS_URL="https://gitlab.syncad.com/hive/haf/-/raw/develop/scripts/ci-helpers/source-patterns.sh"
diff --git a/database/hafbe_app_helpers.sql b/database/hafbe_app_helpers.sql
index a4aacb14d016645c5b78edf2edb5fd5cf1f3408a..ee5be738628ad1fc51e2fe4475b7a8927cec554f 100644
--- a/database/hafbe_app_helpers.sql
+++ b/database/hafbe_app_helpers.sql
@@ -111,10 +111,10 @@ $$
 BEGIN
   IF hive.get_current_stage_name(_context_name) = 'MASSIVE_PROCESSING' THEN
     CALL hafbe_app.massive_processing(_block_range.first_block, _block_range.last_block, _logs);
-    PERFORM hive.app_request_table_vacuum('hafbe_app.current_witness_votes', interval '30 minutes');
-    PERFORM hive.app_request_table_vacuum('hafbe_app.current_witnesses', interval '30 minutes');
-    PERFORM hive.app_request_table_vacuum('hafbe_app.current_account_proxies', interval '30 minutes');
-    
+    PERFORM hive.app_request_table_vacuum('hafbe_app', 'current_witness_votes', interval '30 minutes');
+    PERFORM hive.app_request_table_vacuum('hafbe_app', 'current_witnesses', interval '30 minutes');
+    PERFORM hive.app_request_table_vacuum('hafbe_app', 'current_account_proxies', interval '30 minutes');
+
     RETURN;
   END IF;
   IF NOT hafbe_app.isIndexesCreated() THEN
@@ -122,10 +122,10 @@ BEGIN
   END IF;
   CALL hafbe_app.single_processing(_block_range.first_block, _logs);
   -- cache tables needs to be vacuumed, due to change from `TRUNCATE TABLE` to `DELETE FROM` in block processing
-  PERFORM hive.app_request_table_vacuum('hafbe_app.account_vest_stats_cache',   interval '10 minutes');
-  PERFORM hive.app_request_table_vacuum('hafbe_app.witness_votes_cache',        interval '10 minutes');
-  PERFORM hive.app_request_table_vacuum('hafbe_app.witness_rank_cache',         interval '10 minutes');
-  PERFORM hive.app_request_table_vacuum('hafbe_app.witness_votes_change_cache', interval '10 minutes');   
+  PERFORM hive.app_request_table_vacuum('hafbe_app', 'account_vest_stats_cache',   interval '10 minutes');
+  PERFORM hive.app_request_table_vacuum('hafbe_app', 'witness_votes_cache',        interval '10 minutes');
+  PERFORM hive.app_request_table_vacuum('hafbe_app', 'witness_rank_cache',         interval '10 minutes');
+  PERFORM hive.app_request_table_vacuum('hafbe_app', 'witness_votes_change_cache', interval '10 minutes');   
 END
 $$;
 
diff --git a/submodules/btracker b/submodules/btracker
index 4c6c40d3d1bec5de343a4344ce19e95fc97720b3..fc2a0aef2c523fdc4d97ce73dcd0d8b3ac3de46f 160000
--- a/submodules/btracker
+++ b/submodules/btracker
@@ -1 +1 @@
-Subproject commit 4c6c40d3d1bec5de343a4344ce19e95fc97720b3
+Subproject commit fc2a0aef2c523fdc4d97ce73dcd0d8b3ac3de46f
diff --git a/submodules/hafah b/submodules/hafah
index c34ecdd6fc87d4b792695f20530f2ab910455755..f7295e3f0b77f0c02b4489f20b5207684e3eb1de 160000
--- a/submodules/hafah
+++ b/submodules/hafah
@@ -1 +1 @@
-Subproject commit c34ecdd6fc87d4b792695f20530f2ab910455755
+Subproject commit f7295e3f0b77f0c02b4489f20b5207684e3eb1de
diff --git a/submodules/reptracker b/submodules/reptracker
index e93888e885c4c9c52aadea0a5bcf1d8e4e3bd5dd..e392a9d936c7c820d6d0630c1d08ed9f9e71bac5 160000
--- a/submodules/reptracker
+++ b/submodules/reptracker
@@ -1 +1 @@
-Subproject commit e93888e885c4c9c52aadea0a5bcf1d8e4e3bd5dd
+Subproject commit e392a9d936c7c820d6d0630c1d08ed9f9e71bac5