diff --git a/ccip/config/evm/Astar_Mainnet.toml b/ccip/config/evm/Astar_Mainnet.toml
index 87808001eb..4f78522872 100644
--- a/ccip/config/evm/Astar_Mainnet.toml
+++ b/ccip/config/evm/Astar_Mainnet.toml
@@ -6,4 +6,9 @@ LogPollInterval = '6s'
 [GasEstimator]
 EIP1559DynamicFees = false
 PriceMax = '100000 gwei'
-LimitDefault = 8000000
\ No newline at end of file
+LimitDefault = 8000000
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
\ No newline at end of file
diff --git a/ccip/config/evm/Astar_Shibuya.toml b/ccip/config/evm/Astar_Shibuya.toml
index 5a5df06f6f..852774244e 100644
--- a/ccip/config/evm/Astar_Shibuya.toml
+++ b/ccip/config/evm/Astar_Shibuya.toml
@@ -6,4 +6,9 @@ LogPollInterval = '6s'
 [GasEstimator]
 EIP1559DynamicFees = false
 PriceMax = '100000 gwei'
-LimitDefault = 8000000
\ No newline at end of file
+LimitDefault = 8000000
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Avalanche_ANZ_testnet.toml b/ccip/config/evm/Avalanche_ANZ_testnet.toml
index 4833881bf4..c760e198fc 100644
--- a/ccip/config/evm/Avalanche_ANZ_testnet.toml
+++ b/ccip/config/evm/Avalanche_ANZ_testnet.toml
@@ -17,3 +17,8 @@ PriceMin = '25 gwei'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 24
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Avalanche_Mainnet.toml b/ccip/config/evm/Avalanche_Mainnet.toml
index e7813842b4..a4c77834e3 100644
--- a/ccip/config/evm/Avalanche_Mainnet.toml
+++ b/ccip/config/evm/Avalanche_Mainnet.toml
@@ -17,3 +17,8 @@ PriceMin = '25 gwei'
 [GasEstimator.BlockHistory]
 # Average block time of 2s
 BlockHistorySize = 24
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/BSC_Mainnet.toml b/ccip/config/evm/BSC_Mainnet.toml
index 10f4c570be..f73750ff6c 100644
--- a/ccip/config/evm/BSC_Mainnet.toml
+++ b/ccip/config/evm/BSC_Mainnet.toml
@@ -26,3 +26,8 @@ ObservationGracePeriod = '500ms'
 
 [NodePool]
 SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Base_Mainnet.toml b/ccip/config/evm/Base_Mainnet.toml
index da38182b19..76095cab24 100644
--- a/ccip/config/evm/Base_Mainnet.toml
+++ b/ccip/config/evm/Base_Mainnet.toml
@@ -20,6 +20,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Base_Sepolia.toml b/ccip/config/evm/Base_Sepolia.toml
index 92f7717b27..e5abb22b20 100644
--- a/ccip/config/evm/Base_Sepolia.toml
+++ b/ccip/config/evm/Base_Sepolia.toml
@@ -21,6 +21,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Blast_Mainnet.toml b/ccip/config/evm/Blast_Mainnet.toml
index f8b501723f..64e19420b3 100644
--- a/ccip/config/evm/Blast_Mainnet.toml
+++ b/ccip/config/evm/Blast_Mainnet.toml
@@ -26,6 +26,9 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 # 4 block sync time between nodes to ensure they aren't labelled unreachable too soon
diff --git a/ccip/config/evm/Blast_Sepolia.toml b/ccip/config/evm/Blast_Sepolia.toml
index 96dc5c6787..7a50c2aeb9 100644
--- a/ccip/config/evm/Blast_Sepolia.toml
+++ b/ccip/config/evm/Blast_Sepolia.toml
@@ -26,6 +26,9 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 # 4 block sync time between nodes to ensure they aren't labelled unreachable too soon
diff --git a/ccip/config/evm/Celo_Mainnet.toml b/ccip/config/evm/Celo_Mainnet.toml
index a494862037..cd2e720306 100644
--- a/ccip/config/evm/Celo_Mainnet.toml
+++ b/ccip/config/evm/Celo_Mainnet.toml
@@ -18,3 +18,6 @@ BlockHistorySize = 12
 
 [HeadTracker]
 HistoryDepth = 50
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Gnosis_Chiado.toml b/ccip/config/evm/Gnosis_Chiado.toml
index 379377a226..9c2016cfe9 100644
--- a/ccip/config/evm/Gnosis_Chiado.toml
+++ b/ccip/config/evm/Gnosis_Chiado.toml
@@ -8,3 +8,8 @@ NoNewFinalizedHeadsThreshold = '2m'
 [GasEstimator]
 EIP1559DynamicFees = true
 PriceMax = '500 gwei'
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Kroma_Mainnet.toml b/ccip/config/evm/Kroma_Mainnet.toml
index 3a48aa8ae1..036460f563 100644
--- a/ccip/config/evm/Kroma_Mainnet.toml
+++ b/ccip/config/evm/Kroma_Mainnet.toml
@@ -19,6 +19,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 400
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Kroma_Sepolia.toml b/ccip/config/evm/Kroma_Sepolia.toml
index 9609a09e07..2e5f7f7a25 100644
--- a/ccip/config/evm/Kroma_Sepolia.toml
+++ b/ccip/config/evm/Kroma_Sepolia.toml
@@ -19,6 +19,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 400
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/L3X_Mainnet.toml b/ccip/config/evm/L3X_Mainnet.toml
index 1fbda42fd2..36922ba1cb 100644
--- a/ccip/config/evm/L3X_Mainnet.toml
+++ b/ccip/config/evm/L3X_Mainnet.toml
@@ -16,3 +16,8 @@ PriceMin = '0'
 PriceDefault = '0.1 gwei'
 FeeCapDefault = '1000 gwei'
 BumpThreshold = 5
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
\ No newline at end of file
diff --git a/ccip/config/evm/L3X_Sepolia.toml b/ccip/config/evm/L3X_Sepolia.toml
index ee515bb72b..49762873ee 100644
--- a/ccip/config/evm/L3X_Sepolia.toml
+++ b/ccip/config/evm/L3X_Sepolia.toml
@@ -16,3 +16,8 @@ PriceMin = '0'
 PriceDefault = '0.1 gwei'
 FeeCapDefault = '1000 gwei'
 BumpThreshold = 5
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
\ No newline at end of file
diff --git a/ccip/config/evm/Linea_Mainnet.toml b/ccip/config/evm/Linea_Mainnet.toml
index 94d8bedc44..922b79877a 100644
--- a/ccip/config/evm/Linea_Mainnet.toml
+++ b/ccip/config/evm/Linea_Mainnet.toml
@@ -15,3 +15,6 @@ ResendAfterThreshold = '3m'
 # set greater than finality depth
 [HeadTracker]
 HistoryDepth = 350
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
\ No newline at end of file
diff --git a/ccip/config/evm/Linea_Sepolia.toml b/ccip/config/evm/Linea_Sepolia.toml
index ac5e18a09b..313c17f56b 100644
--- a/ccip/config/evm/Linea_Sepolia.toml
+++ b/ccip/config/evm/Linea_Sepolia.toml
@@ -10,4 +10,7 @@ PriceMin = '1 wei'
 ResendAfterThreshold = '3m'
 
 [HeadTracker]
-HistoryDepth = 1000
\ No newline at end of file
+HistoryDepth = 1000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
\ No newline at end of file
diff --git a/ccip/config/evm/Mantle_Sepolia.toml b/ccip/config/evm/Mantle_Sepolia.toml
index ee994a7182..f412b58588 100644
--- a/ccip/config/evm/Mantle_Sepolia.toml
+++ b/ccip/config/evm/Mantle_Sepolia.toml
@@ -7,8 +7,11 @@ MinIncomingConfirmations = 1
 
 [HeadTracker]
 HistoryDepth = 600
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
-[GasEstimator]     
+[GasEstimator]
 Mode = 'L2Suggested'
 PriceMax = '200 gwei'
 LimitDefault = 100000000
diff --git a/ccip/config/evm/Metis_Mainnet.toml b/ccip/config/evm/Metis_Mainnet.toml
index f057400d01..0780a5137f 100644
--- a/ccip/config/evm/Metis_Mainnet.toml
+++ b/ccip/config/evm/Metis_Mainnet.toml
@@ -19,3 +19,8 @@ BlockHistorySize = 0
 
 [NodePool]
 SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Metis_Sepolia.toml b/ccip/config/evm/Metis_Sepolia.toml
index 4ff4056c75..2b063db9ad 100644
--- a/ccip/config/evm/Metis_Sepolia.toml
+++ b/ccip/config/evm/Metis_Sepolia.toml
@@ -15,3 +15,8 @@ BlockHistorySize = 0
 
 [NodePool]
 SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
\ No newline at end of file
diff --git a/ccip/config/evm/Mode_Mainnet.toml b/ccip/config/evm/Mode_Mainnet.toml
index 69a8e93fec..2ee1da879b 100644
--- a/ccip/config/evm/Mode_Mainnet.toml
+++ b/ccip/config/evm/Mode_Mainnet.toml
@@ -24,6 +24,9 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 2
diff --git a/ccip/config/evm/Mode_Sepolia.toml b/ccip/config/evm/Mode_Sepolia.toml
index f7398869be..9a23255e44 100644
--- a/ccip/config/evm/Mode_Sepolia.toml
+++ b/ccip/config/evm/Mode_Sepolia.toml
@@ -24,6 +24,9 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 2
diff --git a/ccip/config/evm/Optimism_Mainnet.toml b/ccip/config/evm/Optimism_Mainnet.toml
index b0f56a49d9..49d6935dc7 100644
--- a/ccip/config/evm/Optimism_Mainnet.toml
+++ b/ccip/config/evm/Optimism_Mainnet.toml
@@ -21,6 +21,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Optimism_Sepolia.toml b/ccip/config/evm/Optimism_Sepolia.toml
index 1c71aa5dd8..57bd84810d 100644
--- a/ccip/config/evm/Optimism_Sepolia.toml
+++ b/ccip/config/evm/Optimism_Sepolia.toml
@@ -20,6 +20,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Polygon_Amoy.toml b/ccip/config/evm/Polygon_Amoy.toml
index b05b3053a8..a4823e7cc2 100644
--- a/ccip/config/evm/Polygon_Amoy.toml
+++ b/ccip/config/evm/Polygon_Amoy.toml
@@ -23,6 +23,9 @@ BlockHistorySize = 24
 
 [HeadTracker]
 HistoryDepth = 2000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Polygon_Mainnet.toml b/ccip/config/evm/Polygon_Mainnet.toml
index bf605cab3c..e8e4f4ba0d 100644
--- a/ccip/config/evm/Polygon_Mainnet.toml
+++ b/ccip/config/evm/Polygon_Mainnet.toml
@@ -33,6 +33,9 @@ BlockHistorySize = 24
 [HeadTracker]
 # Polygon suffers from a tremendous number of re-orgs, we need to set this to something very large to be conservative enough
 HistoryDepth = 2000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Polygon_Zkevm_Mainnet.toml b/ccip/config/evm/Polygon_Zkevm_Mainnet.toml
index 79e0cb0fce..ac2e40bac0 100644
--- a/ccip/config/evm/Polygon_Zkevm_Mainnet.toml
+++ b/ccip/config/evm/Polygon_Zkevm_Mainnet.toml
@@ -24,3 +24,6 @@ BlockHistorySize = 12
 [HeadTracker]
 # Polygon suffers from a tremendous number of re-orgs, we need to set this to something very large to be conservative enough
 HistoryDepth = 2000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Scroll_Mainnet.toml b/ccip/config/evm/Scroll_Mainnet.toml
index 4a887b504d..5cf43c1c62 100644
--- a/ccip/config/evm/Scroll_Mainnet.toml
+++ b/ccip/config/evm/Scroll_Mainnet.toml
@@ -17,6 +17,9 @@ BlockHistorySize = 24
 
 [HeadTracker]
 HistoryDepth = 50
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [OCR]
 ContractConfirmations = 1
diff --git a/ccip/config/evm/Scroll_Sepolia.toml b/ccip/config/evm/Scroll_Sepolia.toml
index b2e1cfbd73..825ac0b87b 100644
--- a/ccip/config/evm/Scroll_Sepolia.toml
+++ b/ccip/config/evm/Scroll_Sepolia.toml
@@ -17,6 +17,9 @@ BlockHistorySize = 24
 
 [HeadTracker]
 HistoryDepth = 50
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [OCR]
 ContractConfirmations = 1
diff --git a/ccip/config/evm/Simulated.toml b/ccip/config/evm/Simulated.toml
index 52e78c94ed..c98749fcf7 100644
--- a/ccip/config/evm/Simulated.toml
+++ b/ccip/config/evm/Simulated.toml
@@ -19,6 +19,9 @@ PriceMax = '100 micro'
 HistoryDepth = 10
 MaxBufferSize = 100
 SamplingInterval = '0s'
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [OCR]
 ContractConfirmations = 1
diff --git a/ccip/config/evm/WeMix_Mainnet.toml b/ccip/config/evm/WeMix_Mainnet.toml
index 7d3fcc6bc2..5d6d7a7388 100644
--- a/ccip/config/evm/WeMix_Mainnet.toml
+++ b/ccip/config/evm/WeMix_Mainnet.toml
@@ -14,3 +14,8 @@ ContractConfirmations = 1
 [GasEstimator]
 EIP1559DynamicFees = true
 TipCapDefault = '100 gwei'
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/WeMix_Testnet.toml b/ccip/config/evm/WeMix_Testnet.toml
index 5775097967..f889ee30e1 100644
--- a/ccip/config/evm/WeMix_Testnet.toml
+++ b/ccip/config/evm/WeMix_Testnet.toml
@@ -16,4 +16,6 @@ EIP1559DynamicFees = true
 TipCapDefault = '100 gwei'
 
 [HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
 FinalityTagBypass = false
diff --git a/ccip/config/evm/XLayer_Mainnet.toml b/ccip/config/evm/XLayer_Mainnet.toml
index 4096a4db24..be0c8f5634 100644
--- a/ccip/config/evm/XLayer_Mainnet.toml
+++ b/ccip/config/evm/XLayer_Mainnet.toml
@@ -23,3 +23,6 @@ BlockHistorySize = 12
 
 [HeadTracker]
 HistoryDepth = 2000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/XLayer_Sepolia.toml b/ccip/config/evm/XLayer_Sepolia.toml
index 62e2c1e8ad..638923b983 100644
--- a/ccip/config/evm/XLayer_Sepolia.toml
+++ b/ccip/config/evm/XLayer_Sepolia.toml
@@ -23,3 +23,6 @@ BlockHistorySize = 12
 
 [HeadTracker]
 HistoryDepth = 2000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml b/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
index d1697d137a..59b48995a9 100644
--- a/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
@@ -7,4 +7,9 @@ LogPollInterval = '6s'
 [GasEstimator]
 EIP1559DynamicFees = false
 PriceMax = '100000 gwei'
-LimitDefault = 8000000
\ No newline at end of file
+LimitDefault = 8000000
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml b/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
index 5a5df06f6f..abc89bf907 100644
--- a/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
+++ b/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
@@ -6,4 +6,9 @@ LogPollInterval = '6s'
 [GasEstimator]
 EIP1559DynamicFees = false
 PriceMax = '100000 gwei'
-LimitDefault = 8000000
\ No newline at end of file
+LimitDefault = 8000000
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
\ No newline at end of file
diff --git a/core/chains/evm/config/toml/defaults/Avalanche_ANZ_testnet.toml b/core/chains/evm/config/toml/defaults/Avalanche_ANZ_testnet.toml
index 4833881bf4..c760e198fc 100644
--- a/core/chains/evm/config/toml/defaults/Avalanche_ANZ_testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Avalanche_ANZ_testnet.toml
@@ -17,3 +17,8 @@ PriceMin = '25 gwei'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 24
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml b/core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml
index 5ba2e3cdc7..a775625b70 100644
--- a/core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml
+++ b/core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml
@@ -18,4 +18,6 @@ PriceMin = '25 gwei'
 BlockHistorySize = 24
 
 [HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
 FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml b/core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml
index e7813842b4..1643c70251 100644
--- a/core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml
@@ -17,3 +17,8 @@ PriceMin = '25 gwei'
 [GasEstimator.BlockHistory]
 # Average block time of 2s
 BlockHistorySize = 24
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
\ No newline at end of file
diff --git a/core/chains/evm/config/toml/defaults/BOB_Mainnet.toml b/core/chains/evm/config/toml/defaults/BOB_Mainnet.toml
index 806f7f8726..98ec585a15 100644
--- a/core/chains/evm/config/toml/defaults/BOB_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/BOB_Mainnet.toml
@@ -21,3 +21,8 @@ CacheTimeout = '2s'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 100
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/BOB_Testnet.toml b/core/chains/evm/config/toml/defaults/BOB_Testnet.toml
index 2b5313b5e5..4fd7f8246b 100644
--- a/core/chains/evm/config/toml/defaults/BOB_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/BOB_Testnet.toml
@@ -4,7 +4,7 @@ ChainType = 'optimismBedrock'
 # finality_depth was: ~850
 FinalityDepth = 900
 # block_time was:  2s
-LogPollInterval = '5s'  
+LogPollInterval = '5s'
 
 # finality_depth * block_time / 60 secs = ~30  min (finality time)
 NoNewFinalizedHeadsThreshold = '35m'
@@ -21,3 +21,8 @@ CacheTimeout = '2s'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 100
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml b/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
index e95f0af1eb..cf45edf87f 100644
--- a/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
@@ -28,3 +28,8 @@ ObservationGracePeriod = '500ms'
 
 [NodePool]
 SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/BSC_Testnet.toml b/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
index b27a877812..5af9cb6ac2 100644
--- a/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
@@ -22,6 +22,8 @@ BlockHistorySize = 24
 [HeadTracker]
 HistoryDepth = 100
 SamplingInterval = '1s'
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
 FinalityTagBypass = false
 
 [OCR]
diff --git a/core/chains/evm/config/toml/defaults/Base_Goerli.toml b/core/chains/evm/config/toml/defaults/Base_Goerli.toml
index f9b2e29e9e..5a027477c7 100644
--- a/core/chains/evm/config/toml/defaults/Base_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Base_Goerli.toml
@@ -19,6 +19,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/core/chains/evm/config/toml/defaults/Base_Mainnet.toml b/core/chains/evm/config/toml/defaults/Base_Mainnet.toml
index da38182b19..76095cab24 100644
--- a/core/chains/evm/config/toml/defaults/Base_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Base_Mainnet.toml
@@ -20,6 +20,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/core/chains/evm/config/toml/defaults/Base_Sepolia.toml b/core/chains/evm/config/toml/defaults/Base_Sepolia.toml
index 92f7717b27..e5abb22b20 100644
--- a/core/chains/evm/config/toml/defaults/Base_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Base_Sepolia.toml
@@ -21,6 +21,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml b/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml
index f8b501723f..64e19420b3 100644
--- a/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml
@@ -26,6 +26,9 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 # 4 block sync time between nodes to ensure they aren't labelled unreachable too soon
diff --git a/core/chains/evm/config/toml/defaults/Blast_Sepolia.toml b/core/chains/evm/config/toml/defaults/Blast_Sepolia.toml
index 96dc5c6787..7a50c2aeb9 100644
--- a/core/chains/evm/config/toml/defaults/Blast_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Blast_Sepolia.toml
@@ -26,6 +26,9 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 # 4 block sync time between nodes to ensure they aren't labelled unreachable too soon
diff --git a/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml b/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml
index e33f97750b..9f5c4abeb8 100644
--- a/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml
@@ -22,3 +22,6 @@ BlockHistorySize = 12
 
 [HeadTracker]
 HistoryDepth = 50
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Gnosis_Chiado.toml b/core/chains/evm/config/toml/defaults/Gnosis_Chiado.toml
index 379377a226..9c2016cfe9 100644
--- a/core/chains/evm/config/toml/defaults/Gnosis_Chiado.toml
+++ b/core/chains/evm/config/toml/defaults/Gnosis_Chiado.toml
@@ -8,3 +8,8 @@ NoNewFinalizedHeadsThreshold = '2m'
 [GasEstimator]
 EIP1559DynamicFees = true
 PriceMax = '500 gwei'
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Hedera_Mainnet.toml b/core/chains/evm/config/toml/defaults/Hedera_Mainnet.toml
index 4d5e48816f..32bb929c26 100644
--- a/core/chains/evm/config/toml/defaults/Hedera_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Hedera_Mainnet.toml
@@ -3,7 +3,7 @@ ChainType = 'hedera'
 # Considering the 3-5 (6 including a buffer) seconds of finality and 2 seconds block production
 # We set the depth to 6/2 = 3 blocks, setting to 10 for safety
 FinalityDepth = 10
-# Hedera has high TPS, so polling less often 
+# Hedera has high TPS, so polling less often
 LogPollInterval = '10s'
 MinIncomingConfirmations = 1
 
@@ -28,4 +28,9 @@ ResendAfterThreshold = '2m'
 
 
 [NodePool]
-SyncThreshold = 10
\ No newline at end of file
+SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Hedera_Testnet.toml b/core/chains/evm/config/toml/defaults/Hedera_Testnet.toml
index 6086a43af2..def60f8b50 100644
--- a/core/chains/evm/config/toml/defaults/Hedera_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Hedera_Testnet.toml
@@ -3,7 +3,7 @@ ChainType = 'hedera'
 # Considering the 3-5 (6 including a buffer) seconds of finality and 2 seconds block production
 # We set the depth to 6/2 = 3 blocks, setting to 10 for safety
 FinalityDepth = 10
-# Hedera has high TPS, so polling less often 
+# Hedera has high TPS, so polling less often
 LogPollInterval = '10s'
 MinIncomingConfirmations = 1
 
@@ -28,4 +28,9 @@ ResendAfterThreshold = '2m'
 
 
 [NodePool]
-SyncThreshold = 10
\ No newline at end of file
+SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Klaytn_Mainnet.toml b/core/chains/evm/config/toml/defaults/Klaytn_Mainnet.toml
index 7cf7c2d62e..1637816f30 100644
--- a/core/chains/evm/config/toml/defaults/Klaytn_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Klaytn_Mainnet.toml
@@ -8,3 +8,8 @@ OCR.ContractConfirmations = 1
 Mode = 'SuggestedPrice'
 PriceDefault = '750 gwei' # gwei = ston
 BumpThreshold = 5
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Klaytn_Testnet.toml b/core/chains/evm/config/toml/defaults/Klaytn_Testnet.toml
index a938d46c5c..6063c67695 100644
--- a/core/chains/evm/config/toml/defaults/Klaytn_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Klaytn_Testnet.toml
@@ -8,3 +8,8 @@ OCR.ContractConfirmations = 1
 Mode = 'SuggestedPrice'
 PriceDefault = '750 gwei' # gwei = ston
 BumpThreshold = 5
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml b/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml
index 38af765684..7861aeffb0 100644
--- a/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml
@@ -22,6 +22,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 400
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml b/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml
index b1e505df22..80be5c4056 100644
--- a/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml
@@ -22,6 +22,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 400
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/core/chains/evm/config/toml/defaults/L3X_Mainnet.toml b/core/chains/evm/config/toml/defaults/L3X_Mainnet.toml
index 1fbda42fd2..4bcf855407 100644
--- a/core/chains/evm/config/toml/defaults/L3X_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/L3X_Mainnet.toml
@@ -16,3 +16,9 @@ PriceMin = '0'
 PriceDefault = '0.1 gwei'
 FeeCapDefault = '1000 gwei'
 BumpThreshold = 5
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
+
diff --git a/core/chains/evm/config/toml/defaults/L3X_Sepolia.toml b/core/chains/evm/config/toml/defaults/L3X_Sepolia.toml
index ee515bb72b..ef3f7e393e 100644
--- a/core/chains/evm/config/toml/defaults/L3X_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/L3X_Sepolia.toml
@@ -16,3 +16,9 @@ PriceMin = '0'
 PriceDefault = '0.1 gwei'
 FeeCapDefault = '1000 gwei'
 BumpThreshold = 5
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
+
diff --git a/core/chains/evm/config/toml/defaults/Linea_Goerli.toml b/core/chains/evm/config/toml/defaults/Linea_Goerli.toml
index 915727267d..92a0df4b33 100644
--- a/core/chains/evm/config/toml/defaults/Linea_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Linea_Goerli.toml
@@ -10,3 +10,9 @@ BumpPercent = 40
 [Transactions]
 # increase resend time to align with finality
 ResendAfterThreshold = '3m'
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
+
diff --git a/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml b/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml
index 97570a0d21..1a1bba03d3 100644
--- a/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml
@@ -15,3 +15,6 @@ ResendAfterThreshold = '3m'
 # set greater than finality depth
 [HeadTracker]
 HistoryDepth = 350
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml b/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml
index af70f7ceba..00e8c4e533 100644
--- a/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml
@@ -10,4 +10,7 @@ PriceMin = '1 wei'
 ResendAfterThreshold = '3m'
 
 [HeadTracker]
-HistoryDepth = 1000
\ No newline at end of file
+HistoryDepth = 1000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
\ No newline at end of file
diff --git a/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml b/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml
index d6bfe2cd5a..77bd4c14c4 100644
--- a/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml
@@ -25,3 +25,8 @@ BlockHistorySize = 0
 
 [NodePool]
 SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Mode_Mainnet.toml b/core/chains/evm/config/toml/defaults/Mode_Mainnet.toml
index 69a8e93fec..2ee1da879b 100644
--- a/core/chains/evm/config/toml/defaults/Mode_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Mode_Mainnet.toml
@@ -24,6 +24,9 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 2
diff --git a/core/chains/evm/config/toml/defaults/Mode_Sepolia.toml b/core/chains/evm/config/toml/defaults/Mode_Sepolia.toml
index f7398869be..9a23255e44 100644
--- a/core/chains/evm/config/toml/defaults/Mode_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Mode_Sepolia.toml
@@ -24,6 +24,9 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 2
diff --git a/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml b/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml
index c227a08cf2..465c8b9277 100644
--- a/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml
@@ -20,6 +20,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml b/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml
index b0f56a49d9..49d6935dc7 100644
--- a/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml
@@ -21,6 +21,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/core/chains/evm/config/toml/defaults/Optimism_Sepolia.toml b/core/chains/evm/config/toml/defaults/Optimism_Sepolia.toml
index 1c71aa5dd8..57bd84810d 100644
--- a/core/chains/evm/config/toml/defaults/Optimism_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Optimism_Sepolia.toml
@@ -20,6 +20,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml b/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml
index bca42d9b40..2d08779c5c 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml
@@ -23,6 +23,9 @@ BlockHistorySize = 24
 
 [HeadTracker]
 HistoryDepth = 2000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml b/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml
index bf605cab3c..e8e4f4ba0d 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml
@@ -33,6 +33,9 @@ BlockHistorySize = 24
 [HeadTracker]
 # Polygon suffers from a tremendous number of re-orgs, we need to set this to something very large to be conservative enough
 HistoryDepth = 2000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml b/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml
index 134a0822d0..f9506e3f51 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml
@@ -23,6 +23,9 @@ BlockHistorySize = 24
 
 [HeadTracker]
 HistoryDepth = 2000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml
index 46ce80e29f..a2101f2941 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml
@@ -24,3 +24,6 @@ CacheTimeout = '4s'
 
 [HeadTracker]
 HistoryDepth = 2000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml b/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml
index 4a887b504d..5cf43c1c62 100644
--- a/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml
@@ -17,6 +17,9 @@ BlockHistorySize = 24
 
 [HeadTracker]
 HistoryDepth = 50
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [OCR]
 ContractConfirmations = 1
diff --git a/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml b/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml
index b2e1cfbd73..825ac0b87b 100644
--- a/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml
@@ -17,6 +17,9 @@ BlockHistorySize = 24
 
 [HeadTracker]
 HistoryDepth = 50
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [OCR]
 ContractConfirmations = 1
diff --git a/core/chains/evm/config/toml/defaults/Simulated.toml b/core/chains/evm/config/toml/defaults/Simulated.toml
index 52e78c94ed..c98749fcf7 100644
--- a/core/chains/evm/config/toml/defaults/Simulated.toml
+++ b/core/chains/evm/config/toml/defaults/Simulated.toml
@@ -19,6 +19,9 @@ PriceMax = '100 micro'
 HistoryDepth = 10
 MaxBufferSize = 100
 SamplingInterval = '0s'
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [OCR]
 ContractConfirmations = 1
diff --git a/core/chains/evm/config/toml/defaults/Soneium_Sepolia.toml b/core/chains/evm/config/toml/defaults/Soneium_Sepolia.toml
index 9f4772dd9a..04a5114e01 100755
--- a/core/chains/evm/config/toml/defaults/Soneium_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Soneium_Sepolia.toml
@@ -21,6 +21,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml b/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml
index 7d3fcc6bc2..5d6d7a7388 100644
--- a/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml
@@ -14,3 +14,8 @@ ContractConfirmations = 1
 [GasEstimator]
 EIP1559DynamicFees = true
 TipCapDefault = '100 gwei'
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml b/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml
index 5775097967..f889ee30e1 100644
--- a/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml
@@ -16,4 +16,6 @@ EIP1559DynamicFees = true
 TipCapDefault = '100 gwei'
 
 [HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
 FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml b/core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml
index 62e2c1e8ad..638923b983 100644
--- a/core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml
@@ -23,3 +23,6 @@ BlockHistorySize = 12
 
 [HeadTracker]
 HistoryDepth = 2000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml b/core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml
index 6c36ac0ebb..db92a9387c 100644
--- a/core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml
@@ -25,4 +25,7 @@ BlockHistorySize = 200
 
 [HeadTracker]
 # tracks top N blocks to keep in heads database table. Should store atleast the same # of blocks as finalityDepth
-HistoryDepth = 250
\ No newline at end of file
+HistoryDepth = 250
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
\ No newline at end of file
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index c0bb07347c..4aef0b5a65 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -2443,7 +2443,7 @@ HistoryDepth = 300
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -2856,7 +2856,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -3162,7 +3162,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -3575,7 +3575,7 @@ HistoryDepth = 2000
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -3678,7 +3678,7 @@ HistoryDepth = 2000
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -4090,7 +4090,7 @@ HistoryDepth = 400
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -4193,7 +4193,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -4296,7 +4296,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -4399,7 +4399,7 @@ HistoryDepth = 250
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -4606,7 +4606,7 @@ HistoryDepth = 300
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -4812,7 +4812,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -4916,7 +4916,7 @@ HistoryDepth = 300
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 2
@@ -5018,7 +5018,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -5121,7 +5121,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -5327,7 +5327,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -5738,7 +5738,7 @@ HistoryDepth = 10
 MaxBufferSize = 100
 SamplingInterval = '0s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -5842,7 +5842,7 @@ HistoryDepth = 300
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -6151,7 +6151,7 @@ HistoryDepth = 400
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -6254,7 +6254,7 @@ HistoryDepth = 2000
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -6666,7 +6666,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -6769,7 +6769,7 @@ HistoryDepth = 300
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -6872,7 +6872,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -6976,7 +6976,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -7080,7 +7080,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -7184,7 +7184,7 @@ HistoryDepth = 300
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 2
@@ -7391,7 +7391,7 @@ HistoryDepth = 50
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -7597,7 +7597,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -8014,7 +8014,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -8116,7 +8116,7 @@ HistoryDepth = 1000
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -8218,7 +8218,7 @@ HistoryDepth = 350
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -8424,7 +8424,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -8527,7 +8527,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -8630,7 +8630,7 @@ HistoryDepth = 2000
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -8732,7 +8732,7 @@ HistoryDepth = 2000
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -8938,7 +8938,7 @@ HistoryDepth = 300
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 4
@@ -9041,7 +9041,7 @@ HistoryDepth = 300
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -9145,7 +9145,7 @@ HistoryDepth = 300
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -9560,7 +9560,7 @@ HistoryDepth = 50
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -9663,7 +9663,7 @@ HistoryDepth = 50
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -9766,7 +9766,7 @@ HistoryDepth = 100
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -9972,7 +9972,7 @@ HistoryDepth = 300
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 5
@@ -10076,7 +10076,7 @@ HistoryDepth = 300
 MaxBufferSize = 3
 SamplingInterval = '1s'
 MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 4