diff --git a/docker/compose/aptos-node/validator.yaml b/docker/compose/aptos-node/validator.yaml
index c3836013eef9d..ccea8d0cd830e 100644
--- a/docker/compose/aptos-node/validator.yaml
+++ b/docker/compose/aptos-node/validator.yaml
@@ -17,6 +17,7 @@ consensus:
         waypoint:
           from_file: /opt/aptos/genesis/waypoint.txt
         identity_blob_path: /opt/aptos/genesis/validator-identity.yaml
+  quorum_store_poll_count: 1
 
 execution:
   genesis_file_location: "/opt/aptos/genesis/genesis.blob"
diff --git a/terraform/helm/aptos-node/files/configs/validator.yaml b/terraform/helm/aptos-node/files/configs/validator.yaml
index 3bca3cc84f6b7..901b971ac0344 100644
--- a/terraform/helm/aptos-node/files/configs/validator.yaml
+++ b/terraform/helm/aptos-node/files/configs/validator.yaml
@@ -17,15 +17,15 @@ consensus:
           from_file: /opt/aptos/genesis/waypoint.txt
         identity_blob_path: /opt/aptos/genesis/validator-identity.yaml
   sync_only: {{ $.Values.validator.config.sync_only | default false}}
-  {{- if $.Values.validator.config.mempool_poll_count }}
-  mempool_poll_count: {{ $.Values.validator.config.mempool_poll_count }}
-  {{- end }}
   {{- if $.Values.validator.config.round_initial_timeout_ms }}
   round_initial_timeout_ms: {{ $.Values.validator.config.round_initial_timeout_ms }}
   {{- end }}
   {{- if $.Values.validator.config.max_block_size }}
   max_block_size: {{ $.Values.validator.config.max_block_size}}
   {{- end }}
+  {{- if $.Values.validator.config.quorum_store_poll_count }}
+  quorum_store_poll_count: {{ $.Values.validator.config.quorum_store_poll_count}}
+  {{- end }}
 
 state_sync:
   state_sync_driver:
diff --git a/terraform/helm/aptos-node/values.yaml b/terraform/helm/aptos-node/values.yaml
index 58157ebafb9ab..113ffaf224c75 100644
--- a/terraform/helm/aptos-node/values.yaml
+++ b/terraform/helm/aptos-node/values.yaml
@@ -35,8 +35,8 @@ validator:
     sync_only: false
     concurrency_level: 4
     enable_state_sync_v2: true
-    mempool_poll_count:
     round_initial_timeout_ms:
+    quorum_store_poll_count: 1
     ledger_prune_window: 10000000
     state_store_prune_window: 1000000
     pruning_batch_size: 10000
@@ -93,14 +93,14 @@ service:
       type: LoadBalancer
     loadBalancerSourceRanges:
     enableRestApi: false
-    enableMetricsPort: false
+    enableMetricsPort: true
   # NOTE: these values apply for all fullnode groups
   fullnode:
     external: 
       type: LoadBalancer
     loadBalancerSourceRanges:
     enableRestApi: true
-    enableMetricsPort: false
+    enableMetricsPort: true
 
 serviceAccount:
   # Specifies whether a service account should be created