diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5660797048db10f243302afbb96dcac87caf43b5..219701fa9dcf8190ee8c8ba9dbf04c38ea522823 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,12 +31,12 @@ variables:
   BUILDER_IMAGE_PATH: "registry.gitlab.syncad.com/hive/haf/ci-base-image${BUILDER_IMAGE_TAG}"
   # HAF submodule commit - must match the 'ref:' in the include section below
   # This is needed for service containers which can't access dotenv artifacts
-  HAF_COMMIT: "9611e8909a601400522e6bdaadc4a04772b3be80"
+  HAF_COMMIT: "c593c36926a96e7a347e33737ad322860d4245d1"
 
 include:
 - template: Workflows/Branch-Pipelines.gitlab-ci.yml
 - project: hive/haf
-  ref: 9611e8909a601400522e6bdaadc4a04772b3be80   # develop
+  ref: c593c36926a96e7a347e33737ad322860d4245d1   # 292-app_request_table_vacuum-improvements
   file: /scripts/ci-helpers/prepare_data_image_job.yml
 
 .lint_job:
diff --git a/db/main_loop.sql b/db/main_loop.sql
index 17652cbec4e52eecf6a0df683e5e171f71889311..94162c1300c6660f304d6c89fc532322961c07b1 100644
--- a/db/main_loop.sql
+++ b/db/main_loop.sql
@@ -145,9 +145,9 @@ BEGIN
         IF hive.get_current_stage_name(_context_name) = 'MASSIVE_PROCESSING' THEN
 
           CALL reptracker_massive_processing(_block_range.first_block, _block_range.last_block, _logs);
-          PERFORM hive.app_request_table_vacuum('%s.account_reputations', interval '10 minutes'); 
-          PERFORM hive.app_request_table_vacuum('%s.active_votes', interval '10 minutes'); 
-          PERFORM hive.app_request_table_vacuum('%s.permlinks', interval '100 minutes');
+          PERFORM hive.app_request_table_vacuum('%s', 'account_reputations', interval '10 minutes'); 
+          PERFORM hive.app_request_table_vacuum('%s', 'active_votes', interval '10 minutes'); 
+          PERFORM hive.app_request_table_vacuum('%s', 'permlinks', interval '100 minutes');
           RETURN;
         END IF;
 
diff --git a/haf b/haf
index 9611e8909a601400522e6bdaadc4a04772b3be80..c593c36926a96e7a347e33737ad322860d4245d1 160000
--- a/haf
+++ b/haf
@@ -1 +1 @@
-Subproject commit 9611e8909a601400522e6bdaadc4a04772b3be80
+Subproject commit c593c36926a96e7a347e33737ad322860d4245d1