diff --git a/crates/apollo_deployments/resources/app_configs/replacer_batcher_config.json b/crates/apollo_deployments/resources/app_configs/replacer_batcher_config.json
index 9d39f527dbb..8c883319ecd 100644
--- a/crates/apollo_deployments/resources/app_configs/replacer_batcher_config.json
+++ b/crates/apollo_deployments/resources/app_configs/replacer_batcher_config.json
@@ -2,7 +2,7 @@
   "batcher_config.dynamic_config.n_concurrent_txs": "$$$_BATCHER_CONFIG-DYNAMIC_CONFIG-N_CONCURRENT_TXS_$$$",
   "batcher_config.dynamic_config.proposer_idle_detection_delay_millis": "$$$_BATCHER_CONFIG-DYNAMIC_CONFIG-PROPOSER_IDLE_DETECTION_DELAY_MILLIS_$$$",
   "batcher_config.dynamic_config.storage_reader_server_dynamic_config.enable": false,
-  "batcher_config.dynamic_config.tx_polling_interval_millis": 200,
+  "batcher_config.dynamic_config.tx_polling_interval_millis": "$$$_BATCHER_CONFIG-DYNAMIC_CONFIG-TX_POLLING_INTERVAL_MILLIS_$$$",
   "batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.l1_gas": 4400000,
   "batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.message_segment_length": 3700,
   "batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.n_events": "$$$_BATCHER_CONFIG-STATIC_CONFIG-BLOCK_BUILDER_CONFIG-BOUNCER_CONFIG-BLOCK_MAX_CAPACITY-N_EVENTS_$$$",
@@ -27,7 +27,7 @@
   "batcher_config.static_config.commitment_manager_config.panic_if_task_channel_full": false,
   "batcher_config.static_config.commitment_manager_config.results_channel_size": 1000,
   "batcher_config.static_config.commitment_manager_config.tasks_channel_size": 1000,
-  "batcher_config.static_config.contract_class_manager_config.cairo_native_run_config.cairo_native_mode": "lazy_compilation",
+  "batcher_config.static_config.contract_class_manager_config.cairo_native_run_config.cairo_native_mode": "$$$_BATCHER_CONFIG-STATIC_CONFIG-CONTRACT_CLASS_MANAGER_CONFIG-CAIRO_NATIVE_RUN_CONFIG-CAIRO_NATIVE_MODE_$$$",
   "batcher_config.static_config.contract_class_manager_config.cairo_native_run_config.channel_size": 2000,
   "batcher_config.static_config.contract_class_manager_config.cairo_native_run_config.panic_on_compilation_failure": false,
   "batcher_config.static_config.contract_class_manager_config.contract_cache_size": 2000,
diff --git a/crates/apollo_deployments/resources/app_configs/replacer_gateway_config.json b/crates/apollo_deployments/resources/app_configs/replacer_gateway_config.json
index b2adca2420a..ab86392fdf2 100644
--- a/crates/apollo_deployments/resources/app_configs/replacer_gateway_config.json
+++ b/crates/apollo_deployments/resources/app_configs/replacer_gateway_config.json
@@ -2,7 +2,7 @@
   "gateway_config.static_config.authorized_declarer_accounts": "$$$_GATEWAY_CONFIG-STATIC_CONFIG-AUTHORIZED_DECLARER_ACCOUNTS_$$$",
   "gateway_config.static_config.authorized_declarer_accounts.#is_none": "$$$_GATEWAY_CONFIG-STATIC_CONFIG-AUTHORIZED_DECLARER_ACCOUNTS-IS_NONE_$$$",
   "gateway_config.static_config.block_declare": false,
-  "gateway_config.static_config.contract_class_manager_config.cairo_native_run_config.cairo_native_mode": "lazy_compilation",
+  "gateway_config.static_config.contract_class_manager_config.cairo_native_run_config.cairo_native_mode": "$$$_GATEWAY_CONFIG-STATIC_CONFIG-CONTRACT_CLASS_MANAGER_CONFIG-CAIRO_NATIVE_RUN_CONFIG-CAIRO_NATIVE_MODE_$$$",
   "gateway_config.static_config.contract_class_manager_config.cairo_native_run_config.channel_size": 2000,
   "gateway_config.static_config.contract_class_manager_config.cairo_native_run_config.panic_on_compilation_failure": false,
   "gateway_config.static_config.contract_class_manager_config.contract_cache_size": 300,
@@ -17,7 +17,7 @@
   "gateway_config.static_config.stateful_tx_validator_config.max_nonce_for_validation_skip": "0x1",
   "gateway_config.static_config.stateful_tx_validator_config.min_gas_price_percentage": 100,
   "gateway_config.static_config.stateful_tx_validator_config.reject_future_declare_txs": true,
-  "gateway_config.static_config.stateless_tx_validator_config.allow_client_side_proving": true,
+  "gateway_config.static_config.stateless_tx_validator_config.allow_client_side_proving": "$$$_GATEWAY_CONFIG-STATIC_CONFIG-STATELESS_TX_VALIDATOR_CONFIG-ALLOW_CLIENT_SIDE_PROVING_$$$",
   "gateway_config.static_config.stateless_tx_validator_config.max_calldata_length": 5000,
   "gateway_config.static_config.stateless_tx_validator_config.max_contract_bytecode_size": "$$$_GATEWAY_CONFIG-STATIC_CONFIG-STATELESS_TX_VALIDATOR_CONFIG-MAX_CONTRACT_BYTECODE_SIZE_$$$",
   "gateway_config.static_config.stateless_tx_validator_config.max_contract_class_object_size": 4089446,
diff --git a/crates/apollo_deployments/src/service.rs b/crates/apollo_deployments/src/service.rs
index 5e93a48fdb4..495c4b23661 100644
--- a/crates/apollo_deployments/src/service.rs
+++ b/crates/apollo_deployments/src/service.rs
@@ -35,6 +35,8 @@ const SERVICES_DIR_NAME: &str = "services/";
 const REMOTE_SERVICE_URL_PLACEHOLDER: &str = "remote_service";
 
 // TODO(Tsabary): remove ports and mempool ttl from this list.
+// TODO(Shahak): unify the batcher and gateway `cairo_native_run_config.cairo_native_mode` values
+// using the config pointer mechanism so both components always receive the same value.
 pub static KEYS_TO_BE_REPLACED: phf::Set<&'static str> = phf_set! {
     "base_layer_config.bpo1_start_block_number",
     "base_layer_config.bpo2_start_block_number",
@@ -42,10 +44,12 @@ pub static KEYS_TO_BE_REPLACED: phf::Set<&'static str> = phf_set! {
     "base_layer_config.starknet_contract_address",
     "batcher_config.dynamic_config.n_concurrent_txs",
     "batcher_config.dynamic_config.proposer_idle_detection_delay_millis",
+    "batcher_config.dynamic_config.tx_polling_interval_millis",
     "batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.n_events",
     "batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.receipt_l2_gas",
     "batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.state_diff_size",
     "batcher_config.static_config.block_builder_config.execute_config.n_workers",
+    "batcher_config.static_config.contract_class_manager_config.cairo_native_run_config.cairo_native_mode",
     "batcher_config.static_config.first_block_with_partial_block_hash.#is_none",
     "batcher_config.static_config.first_block_with_partial_block_hash.block_hash",
     "batcher_config.static_config.first_block_with_partial_block_hash.block_number",
@@ -79,8 +83,10 @@ pub static KEYS_TO_BE_REPLACED: phf::Set<&'static str> = phf_set! {
     "eth_fee_token_address",
     "gateway_config.static_config.authorized_declarer_accounts.#is_none",
     "gateway_config.static_config.authorized_declarer_accounts",
+    "gateway_config.static_config.contract_class_manager_config.cairo_native_run_config.cairo_native_mode",
     "gateway_config.static_config.proof_archive_writer_config.bucket_name",
     "gateway_config.static_config.stateful_tx_validator_config.max_allowed_nonce_gap",
+    "gateway_config.static_config.stateless_tx_validator_config.allow_client_side_proving",
     "gateway_config.static_config.stateless_tx_validator_config.max_contract_bytecode_size",
     "gateway_config.static_config.stateless_tx_validator_config.min_gas_price",
     "http_server_config.static_config.port",