diff --git a/ccip/config/evm/Astar_Mainnet.toml b/ccip/config/evm/Astar_Mainnet.toml
index 87808001eb7..5405a67d563 100644
--- a/ccip/config/evm/Astar_Mainnet.toml
+++ b/ccip/config/evm/Astar_Mainnet.toml
@@ -1,4 +1,5 @@
 ChainID = '592'
+ChainType = 'astar'
 FinalityTagEnabled = true
 FinalityDepth = 100
 LogPollInterval = '6s'
@@ -6,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://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Astar_Shibuya.toml b/ccip/config/evm/Astar_Shibuya.toml
index 5a5df06f6f0..cfcd7c31c75 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://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
\ No newline at end of file
diff --git a/ccip/config/evm/Avalanche_ANZ_testnet.toml b/ccip/config/evm/Avalanche_ANZ_testnet.toml
index 1242e1ec06e..936a82d5092 100644
--- a/ccip/config/evm/Avalanche_ANZ_testnet.toml
+++ b/ccip/config/evm/Avalanche_ANZ_testnet.toml
@@ -19,4 +19,6 @@ PriceMin = '25 gwei'
 BlockHistorySize = 24
 
 [HeadTracker]
-PersistenceEnabled = false
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Avalanche_Fuji.toml b/ccip/config/evm/Avalanche_Fuji.toml
index 7df1d26a336..4340b6b861d 100644
--- a/ccip/config/evm/Avalanche_Fuji.toml
+++ b/ccip/config/evm/Avalanche_Fuji.toml
@@ -17,5 +17,6 @@ PriceDefault = '1 gwei'
 BlockHistorySize = 24
 
 [HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
 FinalityTagBypass = false
-PersistenceEnabled = false
diff --git a/ccip/config/evm/Avalanche_Mainnet.toml b/ccip/config/evm/Avalanche_Mainnet.toml
index 341ae5478b3..ac73a7b98fa 100644
--- a/ccip/config/evm/Avalanche_Mainnet.toml
+++ b/ccip/config/evm/Avalanche_Mainnet.toml
@@ -18,4 +18,6 @@ PriceDefault = '1 gwei'
 BlockHistorySize = 24
 
 [HeadTracker]
-PersistenceEnabled = false
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/BOB_Mainnet.toml b/ccip/config/evm/BOB_Mainnet.toml
new file mode 100644
index 00000000000..70cc2fb8ba4
--- /dev/null
+++ b/ccip/config/evm/BOB_Mainnet.toml
@@ -0,0 +1,28 @@
+ChainID = '60808'
+# OP stack https://docs.gobob.xyz/learn/introduction/stack-overview#rollup-layer
+ChainType = 'optimismBedrock'
+# FinalityDepth in mainnet showed more than 3k
+FinalityDepth = 3150
+# block_time was:  2s, adding 1 second buffer 
+LogPollInterval = '3s'
+
+# finality_depth * block_time / 60 secs = ~105  min (finality time)
+NoNewFinalizedHeadsThreshold = '110m'
+
+FinalityTagEnabled = true
+
+[GasEstimator]
+EIP1559DynamicFees = true
+Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/BOB_Testnet.toml b/ccip/config/evm/BOB_Testnet.toml
new file mode 100644
index 00000000000..bd8505c4e44
--- /dev/null
+++ b/ccip/config/evm/BOB_Testnet.toml
@@ -0,0 +1,28 @@
+ChainID = '808813'
+# OP stack https://docs.gobob.xyz/learn/introduction/stack-overview#rollup-layer
+ChainType = 'optimismBedrock'
+# FinalityDepth in mainnet showed more than 3k
+FinalityDepth = 3150
+# block_time was:  2s, adding 1 second buffer
+LogPollInterval = '3s'
+
+# finality_depth * block_time / 60 secs = ~105  min (finality time)
+NoNewFinalizedHeadsThreshold = '110m'
+
+FinalityTagEnabled = true
+
+[GasEstimator]
+EIP1559DynamicFees = true
+Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/BSC_Mainnet.toml b/ccip/config/evm/BSC_Mainnet.toml
index 10f4c570bef..df140e63973 100644
--- a/ccip/config/evm/BSC_Mainnet.toml
+++ b/ccip/config/evm/BSC_Mainnet.toml
@@ -13,6 +13,8 @@ NoNewFinalizedHeadsThreshold = '45s'
 
 [GasEstimator]
 PriceDefault = '5 gwei'
+# Set to the BSC node's default Eth.Miner.GasPrice config
+PriceMin = '3 gwei'
 # 15s delay since feeds update every minute in volatile situations
 BumpThreshold = 5
 
@@ -26,3 +28,8 @@ ObservationGracePeriod = '500ms'
 
 [NodePool]
 SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/BSC_Testnet.toml b/ccip/config/evm/BSC_Testnet.toml
index bb13501f1a2..9c528f816ea 100644
--- a/ccip/config/evm/BSC_Testnet.toml
+++ b/ccip/config/evm/BSC_Testnet.toml
@@ -22,8 +22,9 @@ BlockHistorySize = 24
 [HeadTracker]
 HistoryDepth = 100
 SamplingInterval = '1s'
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
 FinalityTagBypass = false
-PersistenceEnabled = false
 
 [OCR]
 DatabaseTimeout = '2s'
diff --git a/ccip/config/evm/Base_Mainnet.toml b/ccip/config/evm/Base_Mainnet.toml
index da38182b194..0f895e1bc6b 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://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Base_Sepolia.toml b/ccip/config/evm/Base_Sepolia.toml
index 92f7717b27d..202c544fb4b 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://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Berachain_Testnet.toml b/ccip/config/evm/Berachain_Testnet.toml
new file mode 100644
index 00000000000..9fc810e8908
--- /dev/null
+++ b/ccip/config/evm/Berachain_Testnet.toml
@@ -0,0 +1,24 @@
+ChainID = '80084'
+# finality_depth: instant
+FinalityDepth = 10 
+# block_time: 5s, adding 1 second buffer 
+LogPollInterval = '6s' 
+
+# finality_depth * block_time / 60 secs = ~0.8  min (finality time)
+NoNewFinalizedHeadsThreshold = '5m'
+
+[GasEstimator]
+EIP1559DynamicFees = true
+Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 5s, per recommendation skip 1-2 blocks
+CacheTimeout = '10s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Bitlayer_Mainnet.toml b/ccip/config/evm/Bitlayer_Mainnet.toml
new file mode 100644
index 00000000000..f6d669d4f78
--- /dev/null
+++ b/ccip/config/evm/Bitlayer_Mainnet.toml
@@ -0,0 +1,16 @@
+ChainID = '200901'
+FinalityTagEnabled = false
+FinalityDepth = 21         # confirmed with Bitlayer team and recommended by docs: https://docs.bitlayer.org/docs/Learn/BitlayerNetwork/AboutFinality/#about-finality-at-stage-bitlayer-pos-bitlayer-mainnet-v1
+
+[GasEstimator]
+Mode = 'FeeHistory'
+EIP1559DynamicFees = false
+PriceMax = '1 gwei'        # DS&A recommended value
+PriceMin = '40 mwei'       # During testing, we saw minimum gas prices ~50 mwei
+PriceDefault = '1 gwei'    # As we set PriceMax to '1 gwei' and PriceDefault must be less than or equal to PriceMax
+FeeCapDefault = '1 gwei'   # As we set PriceMax to '1 gwei' and FeeCapDefault must be less than or equal to PriceMax
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Bitlayer_Testnet.toml b/ccip/config/evm/Bitlayer_Testnet.toml
new file mode 100644
index 00000000000..7107527ce2f
--- /dev/null
+++ b/ccip/config/evm/Bitlayer_Testnet.toml
@@ -0,0 +1,16 @@
+ChainID = '200810'
+FinalityTagEnabled = false
+FinalityDepth = 21 # confirmed with Bitlayer team and recommended by docs: https://docs.bitlayer.org/docs/Learn/BitlayerNetwork/AboutFinality/#about-finality-at-stage-bitlayer-pos-bitlayer-mainnet-v1
+
+[GasEstimator]
+Mode='FeeHistory'
+EIP1559DynamicFees = false
+PriceMax = '1 gwei' # DS&A recommended value
+PriceMin = '40 mwei' # During testing, we saw minimum gas prices ~50 mwei
+PriceDefault = '1 gwei' # As we set PriceMax to '1 gwei' and PriceDefault must be less than or equal to PriceMax
+FeeCapDefault = '1 gwei' # As we set PriceMax to '1 gwei' and FeeCapDefault must be less than or equal to PriceMax
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Blast_Mainnet.toml b/ccip/config/evm/Blast_Mainnet.toml
index f8b501723ff..26ecddeec54 100644
--- a/ccip/config/evm/Blast_Mainnet.toml
+++ b/ccip/config/evm/Blast_Mainnet.toml
@@ -26,9 +26,12 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 # 4 block sync time between nodes to ensure they aren't labelled unreachable too soon
 PollFailureThreshold = 4
 # polls every 4sec to check if there is a block produced, since blockRate is ~3sec
-PollInterval = '4s'
\ No newline at end of file
+PollInterval = '4s'
diff --git a/ccip/config/evm/Blast_Sepolia.toml b/ccip/config/evm/Blast_Sepolia.toml
index 96dc5c67871..55f2356ad3a 100644
--- a/ccip/config/evm/Blast_Sepolia.toml
+++ b/ccip/config/evm/Blast_Sepolia.toml
@@ -26,9 +26,12 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 # 4 block sync time between nodes to ensure they aren't labelled unreachable too soon
 PollFailureThreshold = 4
 # polls every 4sec to check if there is a block produced, since blockRate is ~3sec
-PollInterval = '4s'
\ No newline at end of file
+PollInterval = '4s'
diff --git a/ccip/config/evm/Bsquared_Mainnet.toml b/ccip/config/evm/Bsquared_Mainnet.toml
new file mode 100644
index 00000000000..61b0e5337c7
--- /dev/null
+++ b/ccip/config/evm/Bsquared_Mainnet.toml
@@ -0,0 +1,23 @@
+ChainID = '223'
+# OP stack from questionnaire https://docs.google.com/spreadsheets/d/1l8dx1GzxEnjgwH5x3vB60FUr5iFALzPcs6W_wOAiuDs/edit?gid=625078687#gid=625078687
+ChainType = 'optimismBedrock'
+# finality_depth was: ~1900
+FinalityDepth = 2000
+# block_time:  ~2s, adding 1 second buffer 
+LogPollInterval = '3s' 
+
+# finality_depth * block_time / 60 secs = ~66  min (finality time)
+NoNewFinalizedHeadsThreshold = '70m' 
+
+FinalityTagEnabled = true 
+
+[GasEstimator]
+EIP1559DynamicFees = true
+Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
diff --git a/ccip/config/evm/Bsquared_Testnet.toml b/ccip/config/evm/Bsquared_Testnet.toml
new file mode 100644
index 00000000000..b7cfd35fc41
--- /dev/null
+++ b/ccip/config/evm/Bsquared_Testnet.toml
@@ -0,0 +1,23 @@
+ChainID = '1123'
+# OP stack from questionnaire https://docs.google.com/spreadsheets/d/1l8dx1GzxEnjgwH5x3vB60FUr5iFALzPcs6W_wOAiuDs/edit?gid=625078687#gid=625078687
+ChainType = 'optimismBedrock'
+# finality_depth was: ~1900
+FinalityDepth = 2000
+# block_time:  ~2s, adding 1 second buffer  
+LogPollInterval = '3s'
+
+# finality_depth * block_time / 60 secs = ~66  min (finality time)
+NoNewFinalizedHeadsThreshold = '70m'
+
+FinalityTagEnabled = true
+
+[GasEstimator]
+EIP1559DynamicFees = true
+Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
diff --git a/ccip/config/evm/Celo_Mainnet.toml b/ccip/config/evm/Celo_Mainnet.toml
index 0ed08986d32..9da7d632d0d 100644
--- a/ccip/config/evm/Celo_Mainnet.toml
+++ b/ccip/config/evm/Celo_Mainnet.toml
@@ -1,6 +1,10 @@
 ChainID = '42220'
 ChainType = 'celo'
+# FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress.
+# We expect to be able to rely only on FinalityTagEnabled=true in the short future.
+# https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N
 FinalityDepth = 10
+FinalityTagEnabled = true
 LogPollInterval = '5s'
 MinIncomingConfirmations = 1
 NoNewHeadsThreshold = '1m'
@@ -18,4 +22,6 @@ BlockHistorySize = 12
 
 [HeadTracker]
 HistoryDepth = 50
-PersistenceEnabled = false
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Celo_Testnet.toml b/ccip/config/evm/Celo_Testnet.toml
index 0e4594150dd..c03d855acf6 100644
--- a/ccip/config/evm/Celo_Testnet.toml
+++ b/ccip/config/evm/Celo_Testnet.toml
@@ -1,5 +1,8 @@
 ChainID = '44787'
 ChainType = 'celo'
+# FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress.
+# We expect to be able to rely only on FinalityTagEnabled=true in the short future.
+# https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N
 FinalityTagEnabled = true
 FinalityDepth = 2750 # mean finality time of ~37 minutes + 500 block buffer
 LogPollInterval = '1s' # 1 sec block rate
diff --git a/ccip/config/evm/Ethereum_Mainnet.toml b/ccip/config/evm/Ethereum_Mainnet.toml
index 0bcaf35c648..ec3a78156ed 100644
--- a/ccip/config/evm/Ethereum_Mainnet.toml
+++ b/ccip/config/evm/Ethereum_Mainnet.toml
@@ -15,3 +15,8 @@ TransactionPercentile = 50
 
 [OCR2.Automation]
 GasLimit = 10500000
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Ethereum_Sepolia.toml b/ccip/config/evm/Ethereum_Sepolia.toml
index 24a0e68f77a..966f091f891 100644
--- a/ccip/config/evm/Ethereum_Sepolia.toml
+++ b/ccip/config/evm/Ethereum_Sepolia.toml
@@ -14,4 +14,6 @@ TransactionPercentile = 50
 GasLimit = 10500000
 
 [HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
 FinalityTagBypass = false
diff --git a/ccip/config/evm/Fantom_Mainnet.toml b/ccip/config/evm/Fantom_Mainnet.toml
index 7e76d94278d..2af504796e0 100644
--- a/ccip/config/evm/Fantom_Mainnet.toml
+++ b/ccip/config/evm/Fantom_Mainnet.toml
@@ -9,4 +9,9 @@ RPCBlockQueryDelay = 2
 Mode = 'SuggestedPrice'
 
 [OCR2.Automation]
-GasLimit = 3800000
\ No newline at end of file
+GasLimit = 3800000
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Fantom_Testnet.toml b/ccip/config/evm/Fantom_Testnet.toml
index 5f24a76c2e7..b361a8d14dd 100644
--- a/ccip/config/evm/Fantom_Testnet.toml
+++ b/ccip/config/evm/Fantom_Testnet.toml
@@ -9,4 +9,9 @@ RPCBlockQueryDelay = 2
 Mode = 'SuggestedPrice'
 
 [OCR2.Automation]
-GasLimit = 3800000
\ No newline at end of file
+GasLimit = 3800000
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Gnosis_Chiado.toml b/ccip/config/evm/Gnosis_Chiado.toml
index 379377a2266..320aa087209 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://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Gnosis_Mainnet.toml b/ccip/config/evm/Gnosis_Mainnet.toml
index 628646364f5..ec8ac227f78 100644
--- a/ccip/config/evm/Gnosis_Mainnet.toml
+++ b/ccip/config/evm/Gnosis_Mainnet.toml
@@ -16,3 +16,8 @@ PriceDefault = '1 gwei'
 PriceMax = '500 gwei'
 # 1 Gwei is the minimum accepted by the validators (unless whitelisted)
 PriceMin = '1 gwei'
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Harmony_Mainnet.toml b/ccip/config/evm/Harmony_Mainnet.toml
new file mode 100644
index 00000000000..1cee98e77c7
--- /dev/null
+++ b/ccip/config/evm/Harmony_Mainnet.toml
@@ -0,0 +1,13 @@
+ChainID = '1666600000'
+LinkContractAddress = '0x218532a12a389a4a92fC0C5Fb22901D1c19198aA'
+LogPollInterval = '2s'
+MinIncomingConfirmations = 1
+NoNewHeadsThreshold = '30s'
+
+[GasEstimator]
+PriceDefault = '5 gwei'
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Harmony_Testnet.toml b/ccip/config/evm/Harmony_Testnet.toml
new file mode 100644
index 00000000000..8b7c85b9c28
--- /dev/null
+++ b/ccip/config/evm/Harmony_Testnet.toml
@@ -0,0 +1,13 @@
+ChainID = '1666700000'
+LinkContractAddress = '0x8b12Ac23BFe11cAb03a634C1F117D64a7f2cFD3e'
+LogPollInterval = '2s'
+MinIncomingConfirmations = 1
+NoNewHeadsThreshold = '30s'
+
+[GasEstimator]
+PriceDefault = '5 gwei'
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Hashkey_Mainnet.toml b/ccip/config/evm/Hashkey_Mainnet.toml
new file mode 100644
index 00000000000..69450c96f80
--- /dev/null
+++ b/ccip/config/evm/Hashkey_Mainnet.toml
@@ -0,0 +1,16 @@
+ChainID = '177'
+ChainType = 'optimismBedrock'
+FinalityTagEnabled = true
+
+[GasEstimator]
+PriceMax = '1000 gwei'
+LimitDefault = 8000000
+FeeCapDefault = '1000 gwei'
+
+[NodePool]
+PollFailureThreshold = 2
+PollInterval = '8s'
+
+[GasEstimator.DAOracle]
+OracleType = 'opstack'
+OracleAddress = '0x420000000000000000000000000000000000000F'
\ No newline at end of file
diff --git a/ccip/config/evm/Hashkey_Testnet.toml b/ccip/config/evm/Hashkey_Testnet.toml
new file mode 100644
index 00000000000..c342e503a33
--- /dev/null
+++ b/ccip/config/evm/Hashkey_Testnet.toml
@@ -0,0 +1,16 @@
+ChainID = '133'
+ChainType = 'optimismBedrock'
+FinalityTagEnabled = true
+
+[GasEstimator]
+PriceMax = '1000 gwei'
+LimitDefault = 8000000
+FeeCapDefault = '1000 gwei'
+
+[NodePool]
+PollFailureThreshold = 2
+PollInterval = '8s'
+
+[GasEstimator.DAOracle]
+OracleType = 'opstack'
+OracleAddress = '0x420000000000000000000000000000000000000F'
\ No newline at end of file
diff --git a/ccip/config/evm/Heco_Mainnet.toml b/ccip/config/evm/Heco_Mainnet.toml
new file mode 100644
index 00000000000..a39e405be31
--- /dev/null
+++ b/ccip/config/evm/Heco_Mainnet.toml
@@ -0,0 +1,26 @@
+# Heco uses BSC's settings.
+ChainID = '128'
+LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75'
+LogPollInterval = '3s'
+NoNewHeadsThreshold = '30s'
+RPCBlockQueryDelay = 2
+
+[GasEstimator]
+PriceDefault = '5 gwei'
+BumpThreshold = 5
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 24
+
+[OCR]
+DatabaseTimeout = '2s'
+ContractTransmitterTransmitTimeout = '2s'
+ObservationGracePeriod = '500ms'
+
+[NodePool]
+SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Hedera_Mainnet.toml b/ccip/config/evm/Hedera_Mainnet.toml
new file mode 100644
index 00000000000..fdd6528e0a4
--- /dev/null
+++ b/ccip/config/evm/Hedera_Mainnet.toml
@@ -0,0 +1,35 @@
+ChainID = '295'
+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
+LogPollInterval = '10s'
+MinIncomingConfirmations = 1
+
+[BalanceMonitor]
+Enabled = true
+
+[GasEstimator]
+Mode = 'SuggestedPrice'
+# Since Hedera dont have mempool and there's no way for a node to front run or a user to bribe a node to submit the transaction earlier than it's consensus timestamp,
+# But they have automated congesting pricing throttling which would mean at high sustained level the gasPrice itself could be increased to prevent malicious behaviour.
+# Disabling the Bumpthreshold as TXM now implicity handles the bumping after checking on-chain nonce & re-broadcast for Hedera chain type
+BumpThreshold = 0
+BumpMin = '10 gwei'
+BumpPercent = 20
+
+[Transactions]
+# To hit throttling you'd need to maintain 15 m gas /sec over a prolonged period of time.
+# Because Hedera's block times are every 2 secs it's less less likely to happen as compared to other chains
+# Setting this to little higher even though Hedera has High TPS, We have seen 10-12s to get the trasaction mined & 20-25s incase of failures
+# Accounting for Node syncs & avoid re-sending txns before fetching the receipt, setting to 2m
+ResendAfterThreshold = '2m'
+
+[NodePool]
+SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Hedera_Testnet.toml b/ccip/config/evm/Hedera_Testnet.toml
new file mode 100644
index 00000000000..7e9ec3fe2c6
--- /dev/null
+++ b/ccip/config/evm/Hedera_Testnet.toml
@@ -0,0 +1,35 @@
+ChainID = '296'
+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
+LogPollInterval = '10s'
+MinIncomingConfirmations = 1
+
+[BalanceMonitor]
+Enabled = true
+
+[GasEstimator]
+Mode = 'SuggestedPrice'
+# Since Hedera dont have mempool and there's no way for a node to front run or a user to bribe a node to submit the transaction earlier than it's consensus timestamp,
+# But they have automated congesting pricing throttling which would mean at high sustained level the gasPrice itself could be increased to prevent malicious behaviour.
+# Disabling the Bumpthreshold as TXM now implicity handles the bumping after checking on-chain nonce & re-broadcast for Hedera chain type
+BumpThreshold = 0
+BumpMin = '10 gwei'
+BumpPercent = 20
+
+[Transactions]
+# To hit throttling you'd need to maintain 15 m gas /sec over a prolonged period of time.
+# Because Hedera's block times are every 2 secs it's less less likely to happen as compared to other chains
+# Setting this to little higher even though Hedera has High TPS, We have seen 10-12s to get the trasaction mined & 20-25s incase of failures
+# Accounting for Node syncs & avoid re-sending txns before fetching the receipt, setting to 2m
+ResendAfterThreshold = '2m'
+
+[NodePool]
+SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Klaytn_Mainnet.toml b/ccip/config/evm/Klaytn_Mainnet.toml
new file mode 100644
index 00000000000..ff8b97de970
--- /dev/null
+++ b/ccip/config/evm/Klaytn_Mainnet.toml
@@ -0,0 +1,15 @@
+ChainID = '8217'
+FinalityDepth = 10
+MinIncomingConfirmations = 1
+NoNewHeadsThreshold = '30s'
+OCR.ContractConfirmations = 1
+
+[GasEstimator]
+Mode = 'SuggestedPrice'
+PriceDefault = '750 gwei' # gwei = ston
+BumpThreshold = 5
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Klaytn_Testnet.toml b/ccip/config/evm/Klaytn_Testnet.toml
new file mode 100644
index 00000000000..599b604f086
--- /dev/null
+++ b/ccip/config/evm/Klaytn_Testnet.toml
@@ -0,0 +1,15 @@
+ChainID = '1001'
+FinalityDepth = 10
+MinIncomingConfirmations = 1
+NoNewHeadsThreshold = '30s'
+OCR.ContractConfirmations = 1
+
+[GasEstimator]
+Mode = 'SuggestedPrice'
+PriceDefault = '750 gwei' # gwei = ston
+BumpThreshold = 5
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Kroma_Mainnet.toml b/ccip/config/evm/Kroma_Mainnet.toml
index 3a48aa8ae1b..21bbe7c357c 100644
--- a/ccip/config/evm/Kroma_Mainnet.toml
+++ b/ccip/config/evm/Kroma_Mainnet.toml
@@ -1,6 +1,9 @@
 ChainID = '255'
 ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
-FinalityDepth = 400
+# FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress.
+# We expect to be able to rely only on FinalityTagEnabled=true in the short future.
+# https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N
+FinalityDepth = 700
 FinalityTagEnabled = true
 LogPollInterval = '2s'
 NoNewHeadsThreshold = '40s'
@@ -19,6 +22,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 400
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Kroma_Sepolia.toml b/ccip/config/evm/Kroma_Sepolia.toml
index 9609a09e076..120737df47b 100644
--- a/ccip/config/evm/Kroma_Sepolia.toml
+++ b/ccip/config/evm/Kroma_Sepolia.toml
@@ -1,6 +1,9 @@
 ChainID = '2358'
 ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
-FinalityDepth = 400
+# FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress.
+# We expect to be able to rely only on FinalityTagEnabled=true in the short future.
+# https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N
+FinalityDepth = 700
 FinalityTagEnabled = true
 LogPollInterval = '2s'
 NoNewHeadsThreshold = '40s'
@@ -19,6 +22,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 400
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/L3X_Mainnet.toml b/ccip/config/evm/L3X_Mainnet.toml
index 9dd33c9e15d..5f14e5e8e8c 100644
--- a/ccip/config/evm/L3X_Mainnet.toml
+++ b/ccip/config/evm/L3X_Mainnet.toml
@@ -17,5 +17,7 @@ PriceDefault = '0.1 gwei'
 FeeCapDefault = '1000 gwei'
 BumpThreshold = 5
 
-[GasEstimator.DAOracle]
-OracleType = 'arbitrum'
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/L3X_Sepolia.toml b/ccip/config/evm/L3X_Sepolia.toml
index c0f6a60e943..ca21bc13d6e 100644
--- a/ccip/config/evm/L3X_Sepolia.toml
+++ b/ccip/config/evm/L3X_Sepolia.toml
@@ -17,5 +17,7 @@ PriceDefault = '0.1 gwei'
 FeeCapDefault = '1000 gwei'
 BumpThreshold = 5
 
-[GasEstimator.DAOracle]
-OracleType = 'arbitrum'
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Linea_Goerli.toml b/ccip/config/evm/Linea_Goerli.toml
new file mode 100644
index 00000000000..2c85f9cbc02
--- /dev/null
+++ b/ccip/config/evm/Linea_Goerli.toml
@@ -0,0 +1,17 @@
+ChainID = '59140'
+# Block time 12s, finality < 3m
+FinalityDepth = 15
+# Blocks are only emitted when a transaction happens / no empty blocks
+NoNewHeadsThreshold = '0'
+
+[GasEstimator]
+BumpPercent = 40
+
+[Transactions]
+# increase resend time to align with finality
+ResendAfterThreshold = '3m'
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Linea_Mainnet.toml b/ccip/config/evm/Linea_Mainnet.toml
index 5a89873acae..6614fef9d4e 100644
--- a/ccip/config/evm/Linea_Mainnet.toml
+++ b/ccip/config/evm/Linea_Mainnet.toml
@@ -1,6 +1,6 @@
 ChainID = '59144'
-# Block time 12s, finality < 60m
-FinalityDepth = 300
+#3s block time ~ 20m finality based on committee decision
+FinalityDepth = 600
 # Blocks are only emitted when a transaction happens / no empty blocks
 NoNewHeadsThreshold = '0'
 
@@ -15,6 +15,9 @@ ResendAfterThreshold = '3m'
 # set greater than finality depth
 [HeadTracker]
 HistoryDepth = 350
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [Transactions.AutoPurge]
 Enabled = true
diff --git a/ccip/config/evm/Linea_Sepolia.toml b/ccip/config/evm/Linea_Sepolia.toml
index 8f168ee93a6..2837c7ca601 100644
--- a/ccip/config/evm/Linea_Sepolia.toml
+++ b/ccip/config/evm/Linea_Sepolia.toml
@@ -1,5 +1,5 @@
 ChainID = '59141'
-FinalityDepth = 900
+FinalityDepth = 200
 NoNewHeadsThreshold = '0'
 
 [GasEstimator]
@@ -11,6 +11,9 @@ ResendAfterThreshold = '3m'
 
 [HeadTracker]
 HistoryDepth = 1000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [Transactions.AutoPurge]
 Enabled = true
diff --git a/ccip/config/evm/Mantle_Mainnet.toml b/ccip/config/evm/Mantle_Mainnet.toml
new file mode 100644
index 00000000000..23d5168a7e9
--- /dev/null
+++ b/ccip/config/evm/Mantle_Mainnet.toml
@@ -0,0 +1,33 @@
+ChainID = '5000'
+FinalityTagEnabled = true
+FinalityDepth = 1200
+ChainType = 'optimismBedrock'
+LogPollInterval = '2s'
+MinIncomingConfirmations = 1
+NoNewFinalizedHeadsThreshold = '40m0s'
+
+[HeadTracker]
+HistoryDepth = 1250
+
+[GasEstimator]
+PriceMax = '120 gwei'
+# Limit values are high as Mantle's GasPrice is in native token (MNT) instead of ETH. Their proprietary TokenRatio parameter is used to adjust fees
+LimitDefault = 80_000_000_000
+LimitMax = 100_000_000_000
+BumpMin = '100 wei'
+BumpThreshold = 60
+EIP1559DynamicFees = true
+FeeCapDefault = '120 gwei'
+# Mantle recommends setting Priority Fee to 0 in their docs linked here: https://docs-v2.mantle.xyz/devs/concepts/tx-fee/eip-1559#application-of-eip-1559-in-mantle-v2-tectonic
+TipCapDefault = '0 wei'
+TipCapMin = '0 wei'
+
+[GasEstimator.BlockHistory]
+# Default is 24, which leads to bumpy gas prices. In CCIP
+# we want to smooth out the gas prices, so we increase the sample size.
+BlockHistorySize = 200
+# The formula for FeeCap is (current block base fee * (1.125 ^ EIP1559FeeCapBufferBlocks) + tipcap)
+# where tipcap is managed by the block history estimators. In the context of CCIP,
+# the gas price is relayed to other changes for quotes so we want accurate/avg not pessimistic values.
+# So we set this to zero so FeeCap = baseFee + tipcap.
+EIP1559FeeCapBufferBlocks = 0
\ No newline at end of file
diff --git a/ccip/config/evm/Mantle_Sepolia.toml b/ccip/config/evm/Mantle_Sepolia.toml
index ee994a71826..705f91142f2 100644
--- a/ccip/config/evm/Mantle_Sepolia.toml
+++ b/ccip/config/evm/Mantle_Sepolia.toml
@@ -1,19 +1,34 @@
 ChainID = '5003'
+FinalityTagEnabled = true
+FinalityDepth = 1200
 ChainType = 'optimismBedrock'
-FinalityDepth = 500
 LogPollInterval = '2s'
-NoNewHeadsThreshold = '0'
 MinIncomingConfirmations = 1
+NoNewFinalizedHeadsThreshold = '60m0s'
 
 [HeadTracker]
-HistoryDepth = 600
+HistoryDepth = 1250
 
-[GasEstimator]     
-Mode = 'L2Suggested'
-PriceMax = '200 gwei'
-LimitDefault = 100000000
-FeeCapDefault = '200 gwei'
+[GasEstimator]
+PriceMax = '120 gwei'
+# Limit values are high as Mantle's GasPrice is in native token (MNT) instead of ETH. Their proprietary TokenRatio parameter is used to adjust fees
+LimitDefault = 80000000000
+LimitMax = 100000000000
+BumpMin = '100 wei'
+BumpPercent = 20
+BumpThreshold = 60
+EIP1559DynamicFees = true
+FeeCapDefault = '120 gwei'
+# Mantle reccomends setting Priority Fee to 0 in their docs linked here: https://docs-v2.mantle.xyz/devs/concepts/tx-fee/eip-1559#application-of-eip-1559-in-mantle-v2-tectonic
+TipCapDefault = '0 wei'
+TipCapMin = '0 wei'
 
 [GasEstimator.BlockHistory]
+# Default is 24, which leads to bumpy gas prices. In CCIP
+# we want to smooth out the gas prices, so we increase the sample size.
 BlockHistorySize = 200
+# The formula for FeeCap is (current block base fee * (1.125 ^ EIP1559FeeCapBufferBlocks) + tipcap)
+# where tipcap is managed by the block history estimators. In the context of CCIP,
+# the gas price is relayed to other changes for quotes so we want accurate/avg not pessimistic values.
+# So we set this to zero so FeeCap = baseFee + tipcap.
 EIP1559FeeCapBufferBlocks = 0
\ No newline at end of file
diff --git a/ccip/config/evm/Metis_Mainnet.toml b/ccip/config/evm/Metis_Mainnet.toml
index f057400d014..a95945e9f1b 100644
--- a/ccip/config/evm/Metis_Mainnet.toml
+++ b/ccip/config/evm/Metis_Mainnet.toml
@@ -1,8 +1,14 @@
 # Metis is an L2 chain based on Optimism.
 ChainID = '1088'
-ChainType = 'metis'
+ChainType = 'optimismBedrock'
 # Sequencer offers absolute finality
-FinalityDepth = 10
+# High variation on finality depth triggered a commitee to investigate
+# and set 500 as a secure finality depth.
+# https://chainlink-core.slack.com/archives/C0725LNLJLA/p1717118469587219
+FinalityDepth = 500
+# FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress.
+# We expect to be able to rely only on FinalityTagEnabled=true in the short future.
+# https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N
 FinalityTagEnabled = true
 MinIncomingConfirmations = 1
 NoNewHeadsThreshold = '0'
@@ -19,3 +25,8 @@ BlockHistorySize = 0
 
 [NodePool]
 SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Metis_Sepolia.toml b/ccip/config/evm/Metis_Sepolia.toml
index 4ff4056c75d..65247991d31 100644
--- a/ccip/config/evm/Metis_Sepolia.toml
+++ b/ccip/config/evm/Metis_Sepolia.toml
@@ -1,6 +1,9 @@
 ChainID = '59902'
 ChainType = 'optimismBedrock'
-FinalityDepth = 10
+# FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress.
+# We expect to be able to rely only on FinalityTagEnabled=true in the short future.
+# https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N
+FinalityDepth = 3000
 FinalityTagEnabled = true
 MinIncomingConfirmations = 1
 NoNewHeadsThreshold = '0'
diff --git a/ccip/config/evm/Mode_Mainnet.toml b/ccip/config/evm/Mode_Mainnet.toml
index 69a8e93fecd..b586cdacc78 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://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 2
diff --git a/ccip/config/evm/Mode_Sepolia.toml b/ccip/config/evm/Mode_Sepolia.toml
index f7398869beb..d621010b4ef 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://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 2
diff --git a/ccip/config/evm/Optimism_Mainnet.toml b/ccip/config/evm/Optimism_Mainnet.toml
index b0f56a49d90..e1398775495 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://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Optimism_Sepolia.toml b/ccip/config/evm/Optimism_Sepolia.toml
index 1c71aa5dd83..2590feec51a 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://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Polygon_Amoy.toml b/ccip/config/evm/Polygon_Amoy.toml
index b05b3053a8e..eb75eab271b 100644
--- a/ccip/config/evm/Polygon_Amoy.toml
+++ b/ccip/config/evm/Polygon_Amoy.toml
@@ -11,10 +11,10 @@ NoNewFinalizedHeadsThreshold = '12m'
 MaxQueued = 5000
 
 [GasEstimator]
-EIP1559DynamicFees = true
-PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
 PriceDefault = '25 gwei'
+PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
 PriceMin = '25 gwei'
+EIP1559DynamicFees = true
 BumpMin = '20 gwei'
 BumpThreshold = 5
 
@@ -23,6 +23,9 @@ BlockHistorySize = 24
 
 [HeadTracker]
 HistoryDepth = 2000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Polygon_Mainnet.toml b/ccip/config/evm/Polygon_Mainnet.toml
index bf605cab3c6..555dbfff815 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://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Polygon_Mumbai.toml b/ccip/config/evm/Polygon_Mumbai.toml
new file mode 100644
index 00000000000..83f275a0643
--- /dev/null
+++ b/ccip/config/evm/Polygon_Mumbai.toml
@@ -0,0 +1,31 @@
+ChainID = '80001'
+FinalityDepth = 500
+FinalityTagEnabled = true
+LinkContractAddress = '0x326C977E6efc84E512bB9C30f76E30c160eD06FB'
+LogPollInterval = '1s'
+MinIncomingConfirmations = 5
+NoNewHeadsThreshold = '30s'
+RPCBlockQueryDelay = 10
+RPCDefaultBatchSize = 100
+
+[Transactions]
+MaxQueued = 5000
+
+[GasEstimator]
+PriceDefault = '25 gwei'
+PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
+PriceMin = '25 gwei'
+BumpMin = '20 gwei'
+BumpThreshold = 5
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 24
+
+[HeadTracker]
+HistoryDepth = 2000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
+
+[NodePool]
+SyncThreshold = 10
diff --git a/ccip/config/evm/Polygon_Zkevm_Cardona.toml b/ccip/config/evm/Polygon_Zkevm_Cardona.toml
index 5e4861f9d44..146c23a8024 100644
--- a/ccip/config/evm/Polygon_Zkevm_Cardona.toml
+++ b/ccip/config/evm/Polygon_Zkevm_Cardona.toml
@@ -13,15 +13,20 @@ ContractConfirmations = 1
 ResendAfterThreshold = '3m'
 
 [GasEstimator]
-PriceMin = '1 mwei'
+Mode = 'FeeHistory'
+# The FeeHistory estimator does not enforce PriceMin, setting it to 0 to not place any limits on the price
+PriceMin = '0'
 BumpPercent = 40
-BumpMin = '20 mwei'
 
-[GasEstimator.BlockHistory]
-BlockHistorySize = 12
+[GasEstimator.FeeHistory]
+# Refresh the suggested price every 4 seconds, to stay slightly below their polling rate of 5s
+CacheTimeout = '4s'
 
 [HeadTracker]
 HistoryDepth = 2000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [Transactions.AutoPurge]
 Enabled = true
diff --git a/ccip/config/evm/Polygon_Zkevm_Mainnet.toml b/ccip/config/evm/Polygon_Zkevm_Mainnet.toml
index b38a483ff35..d42ef9b057e 100644
--- a/ccip/config/evm/Polygon_Zkevm_Mainnet.toml
+++ b/ccip/config/evm/Polygon_Zkevm_Mainnet.toml
@@ -1,6 +1,6 @@
 ChainID = '1101'
 ChainType = 'zkevm'
-FinalityDepth = 500
+FinalityDepth = 1000
 NoNewHeadsThreshold = '6m'
 MinIncomingConfirmations = 1
 LogPollInterval = '30s'
@@ -14,12 +14,14 @@ ContractConfirmations = 1
 ResendAfterThreshold = '3m'
 
 [GasEstimator]
-PriceMin = '100 mwei'
+Mode = 'FeeHistory'
+# The FeeHistory estimator does not enforce PriceMin, setting it to 0 to not place any limits on the price
+PriceMin = '0'
 BumpPercent = 40
-BumpMin = '100 mwei'
 
-[GasEstimator.BlockHistory]
-BlockHistorySize = 12
+[GasEstimator.FeeHistory]
+# Refresh the suggested price every 4 seconds, to stay slightly below their polling rate of 5s
+CacheTimeout = '4s'
 
 [HeadTracker]
 # Polygon suffers from a tremendous number of re-orgs, we need to set this to something very large to be conservative enough
diff --git a/ccip/config/evm/RSK_Mainnet.toml b/ccip/config/evm/RSK_Mainnet.toml
new file mode 100644
index 00000000000..8290481a331
--- /dev/null
+++ b/ccip/config/evm/RSK_Mainnet.toml
@@ -0,0 +1,13 @@
+# RSK prices its txes in sats not wei
+ChainID = '30'
+LinkContractAddress = '0x14AdaE34beF7ca957Ce2dDe5ADD97ea050123827'
+LogPollInterval = '30s'
+MinContractPayment = '0.001 link'
+
+[GasEstimator]
+# It's about 100 times more expensive than Wei, very roughly speaking
+PriceDefault = '50 mwei'
+PriceMax = '50 gwei'
+PriceMin = '0'
+# rsk does not yet support EIP-1559 but this allows validation to pass
+FeeCapDefault = '100 mwei'
diff --git a/ccip/config/evm/RSK_Testnet.toml b/ccip/config/evm/RSK_Testnet.toml
new file mode 100644
index 00000000000..2fde16aa7cc
--- /dev/null
+++ b/ccip/config/evm/RSK_Testnet.toml
@@ -0,0 +1,10 @@
+ChainID = '31'
+LinkContractAddress = '0x8bBbd80981FE76d44854D8DF305e8985c19f0e78'
+MinContractPayment = '0.001 link'
+LogPollInterval = '30s'
+
+[GasEstimator]
+PriceDefault = '50 mwei'
+PriceMax = '50 gwei'
+PriceMin = '0'
+FeeCapDefault = '100 mwei'
diff --git a/ccip/config/evm/Ronin_Mainnet.toml b/ccip/config/evm/Ronin_Mainnet.toml
new file mode 100644
index 00000000000..14bb9d1e258
--- /dev/null
+++ b/ccip/config/evm/Ronin_Mainnet.toml
@@ -0,0 +1,16 @@
+ChainID = "2020"
+FinalityTagEnabled = true
+LinkContractAddress = "0x3902228D6A3d2Dc44731fD9d45FeE6a61c722D0b"
+# Ronin produces blocks every 3 seconds
+LogPollInterval = "3s"
+NoNewHeadsThreshold = "3m"
+
+[GasEstimator]
+# Ronin uses default gas price of 20 gwei https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview
+Mode = 'FeeHistory'
+PriceMax = "1000 gwei"
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Ronin_Saigon.toml b/ccip/config/evm/Ronin_Saigon.toml
new file mode 100644
index 00000000000..b775f8f0626
--- /dev/null
+++ b/ccip/config/evm/Ronin_Saigon.toml
@@ -0,0 +1,16 @@
+ChainID = "2021"
+FinalityTagEnabled = true
+LinkContractAddress = "0x5bB50A6888ee6a67E22afFDFD9513be7740F1c15"
+# Ronin produces blocks every 3 seconds
+LogPollInterval = "3s"
+NoNewHeadsThreshold = "3m"
+
+[GasEstimator]
+# Ronin uses default gas price of 20 gwei https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview
+Mode = 'FeeHistory'
+PriceMax = "1000 gwei"
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Scroll_Mainnet.toml b/ccip/config/evm/Scroll_Mainnet.toml
index b8e7bd09e80..f0449ef12be 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://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [OCR]
 ContractConfirmations = 1
diff --git a/ccip/config/evm/Scroll_Sepolia.toml b/ccip/config/evm/Scroll_Sepolia.toml
index baee2080d96..aca06ae18d3 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://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [OCR]
 ContractConfirmations = 1
diff --git a/ccip/config/evm/Simulated.toml b/ccip/config/evm/Simulated.toml
index e21dc0990f0..4ec8d962b21 100644
--- a/ccip/config/evm/Simulated.toml
+++ b/ccip/config/evm/Simulated.toml
@@ -1,5 +1,5 @@
 ChainID = '1337'
-FinalityDepth = 1
+FinalityDepth = 10
 MinIncomingConfirmations = 1
 MinContractPayment = '100'
 NoNewHeadsThreshold = '0s'
@@ -19,7 +19,9 @@ PriceMax = '100 micro'
 HistoryDepth = 10
 MaxBufferSize = 100
 SamplingInterval = '0s'
-PersistenceEnabled = false
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [OCR]
 ContractConfirmations = 1
diff --git a/ccip/config/evm/Soneium_Sepolia.toml b/ccip/config/evm/Soneium_Sepolia.toml
new file mode 100755
index 00000000000..e0ea59ca22f
--- /dev/null
+++ b/ccip/config/evm/Soneium_Sepolia.toml
@@ -0,0 +1,35 @@
+ChainID = '1946'
+ChainType = 'optimismBedrock'
+LinkContractAddress = '0x7ea13478Ea3961A0e8b538cb05a9DF0477c79Cd2'
+FinalityDepth = 200
+LogPollInterval = '2s'
+NoNewHeadsThreshold = '40s'
+MinIncomingConfirmations = 1
+NoNewFinalizedHeadsThreshold = '120m' # Soneium can take upto 2Hours to finalize
+FinalityTagEnabled = true
+
+[GasEstimator]
+EIP1559DynamicFees = true
+PriceMin = '1 wei'
+BumpMin = '1 mwei'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 60
+
+[Transactions]
+ResendAfterThreshold = '30s'
+
+[HeadTracker]
+HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
+
+[NodePool]
+SyncThreshold = 10
+
+[OCR]
+ContractConfirmations = 1
+
+[OCR2.Automation]
+GasLimit = 6500000
diff --git a/ccip/config/evm/Sonic_Mainnet.toml b/ccip/config/evm/Sonic_Mainnet.toml
new file mode 100644
index 00000000000..523a931c8d6
--- /dev/null
+++ b/ccip/config/evm/Sonic_Mainnet.toml
@@ -0,0 +1,28 @@
+ChainId = '146'
+FinalityDepth = 10 
+FinalityTagEnabled = false
+LogPollInterval = "1s" #1s block rate
+MinIncomingConfirmations = 5
+RPCBlockQueryDelay = 10
+RPCDefaultBatchSize = 100 
+
+[GasEstimator]
+Mode = 'FeeHistory'
+EIP1559DynamicFees = true 
+BumpPercent = 10
+LimitDefault = 8000000 # default ccip value 
+
+[GasEstimator.FeeHistory]
+CacheTimeout = '2s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
+
+[HeadTracker]
+HistoryDepth = 50 
+
+[NodePool]
+SyncThreshold = 10
+
+[Transactions]
+MaxQueued = 500
\ No newline at end of file
diff --git a/ccip/config/evm/Sonic_Testnet.toml b/ccip/config/evm/Sonic_Testnet.toml
new file mode 100644
index 00000000000..ca3ccf8f718
--- /dev/null
+++ b/ccip/config/evm/Sonic_Testnet.toml
@@ -0,0 +1,28 @@
+ChainId = '57054'
+FinalityDepth = 10 
+FinalityTagEnabled = false
+LogPollInterval = "1s" #1s block rate
+MinIncomingConfirmations = 5
+RPCBlockQueryDelay = 10
+RPCDefaultBatchSize = 100 
+
+[GasEstimator]
+Mode = 'FeeHistory'
+EIP1559DynamicFees = true 
+BumpPercent = 10
+LimitDefault = 8000000 # default ccip value 
+
+[GasEstimator.FeeHistory]
+CacheTimeout = '2s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
+
+[HeadTracker]
+HistoryDepth = 50 
+
+[NodePool]
+SyncThreshold = 10
+
+[Transactions]
+MaxQueued = 500
\ No newline at end of file
diff --git a/ccip/config/evm/Unichain_Testnet.toml b/ccip/config/evm/Unichain_Testnet.toml
new file mode 100644
index 00000000000..5e18f0d4716
--- /dev/null
+++ b/ccip/config/evm/Unichain_Testnet.toml
@@ -0,0 +1,26 @@
+ChainID = '1301'
+# OP stack: https://docs.unichain.org/docs/getting-started/set-up-a-node#overview
+ChainType = 'optimismBedrock'
+# finality_depth was: ~1900
+FinalityDepth = 2000
+# block_time was:  ~1s, adding 1 second buffer 
+LogPollInterval = '2s'
+
+# batching_size_finalization_percentage = 30% according to the explorer batching view
+# ( batching_size_finalization_percentage * finality_depth) * block_time / 60 secs = ~10  min (finality time)
+# After running soak tests using 10m threw issues as there are batchs that take 35m, so we are bumping it to 45m to be sure 
+NoNewFinalizedHeadsThreshold = '45m'
+
+FinalityTagEnabled = true
+
+[GasEstimator]
+EIP1559DynamicFees = true
+Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 1s, per recommendation skip 1-2 blocks
+CacheTimeout = '2s'
+
+[GasEstimator.BlockHistory]
+# As we see blocks containing between ~[8-12]tx, to get about ~1000 tx to check we would need to rougly go 100 tx back
+BlockHistorySize = 100
diff --git a/ccip/config/evm/WeMix_Mainnet.toml b/ccip/config/evm/WeMix_Mainnet.toml
index be7c278f692..a4e742d7300 100644
--- a/ccip/config/evm/WeMix_Mainnet.toml
+++ b/ccip/config/evm/WeMix_Mainnet.toml
@@ -16,4 +16,6 @@ EIP1559DynamicFees = true
 TipCapDefault = '100 gwei'
 
 [HeadTracker]
-PersistenceEnabled = false
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
diff --git a/ccip/config/evm/WeMix_Testnet.toml b/ccip/config/evm/WeMix_Testnet.toml
index 4591fc4c572..bfb75f158e3 100644
--- a/ccip/config/evm/WeMix_Testnet.toml
+++ b/ccip/config/evm/WeMix_Testnet.toml
@@ -16,5 +16,6 @@ EIP1559DynamicFees = true
 TipCapDefault = '100 gwei'
 
 [HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
 FinalityTagBypass = false
-PersistenceEnabled = false
diff --git a/ccip/config/evm/Worldchain_Mainnet.toml b/ccip/config/evm/Worldchain_Mainnet.toml
new file mode 100644
index 00000000000..9b25d89d98c
--- /dev/null
+++ b/ccip/config/evm/Worldchain_Mainnet.toml
@@ -0,0 +1,23 @@
+ChainID = '480'
+# OP stack: https://worldcoin.notion.site/World-Chain-Developer-Preview-Guide-23c94a67683f4e71986e5303ab88c9f3
+ChainType = 'optimismBedrock'
+# finality_depth was: ~2400
+FinalityDepth = 2500
+# block_time was:  2s, adding 1 second buffer   
+LogPollInterval = '3s'
+
+# finality_depth * block_time / 60 secs = ~83  min (finality time)
+NoNewFinalizedHeadsThreshold = '90m'
+
+FinalityTagEnabled = true
+
+[GasEstimator]
+EIP1559DynamicFees = true
+Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
diff --git a/ccip/config/evm/Worldchain_Testnet.toml b/ccip/config/evm/Worldchain_Testnet.toml
new file mode 100644
index 00000000000..01618322285
--- /dev/null
+++ b/ccip/config/evm/Worldchain_Testnet.toml
@@ -0,0 +1,23 @@
+ChainID = '4801'
+# OP stack: https://worldcoin.notion.site/World-Chain-Developer-Preview-Guide-23c94a67683f4e71986e5303ab88c9f3
+ChainType = 'optimismBedrock'
+# finality_depth was: ~2400
+FinalityDepth = 2500
+# block_time was:  2s, adding 1 second buffer  
+LogPollInterval = '3s'
+
+# finality_depth * block_time / 60 secs = ~83  min (finality time)
+NoNewFinalizedHeadsThreshold = '90m'
+
+FinalityTagEnabled = true
+
+[GasEstimator]
+EIP1559DynamicFees = true
+Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
diff --git a/ccip/config/evm/XLayer_Mainnet.toml b/ccip/config/evm/XLayer_Mainnet.toml
index a39a9231ae2..28f7819276c 100644
--- a/ccip/config/evm/XLayer_Mainnet.toml
+++ b/ccip/config/evm/XLayer_Mainnet.toml
@@ -1,6 +1,6 @@
 ChainID = '196'
 ChainType = 'xlayer'
-FinalityDepth = 500
+FinalityDepth = 1000
 NoNewHeadsThreshold = '6m'
 MinIncomingConfirmations = 1
 LogPollInterval = '30s'
diff --git a/ccip/config/evm/XLayer_Sepolia.toml b/ccip/config/evm/XLayer_Sepolia.toml
index 2aa6e58469b..163d909542e 100644
--- a/ccip/config/evm/XLayer_Sepolia.toml
+++ b/ccip/config/evm/XLayer_Sepolia.toml
@@ -23,6 +23,9 @@ BlockHistorySize = 12
 
 [HeadTracker]
 HistoryDepth = 2000
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [Transactions.AutoPurge]
 Enabled = true
diff --git a/ccip/config/evm/fallback.toml b/ccip/config/evm/fallback.toml
new file mode 100644
index 00000000000..c1f963a33ff
--- /dev/null
+++ b/ccip/config/evm/fallback.toml
@@ -0,0 +1,95 @@
+AutoCreateKey = true
+BlockBackfillDepth = 10
+BlockBackfillSkip = false
+FinalityDepth = 50
+FinalityTagEnabled = false
+LogBackfillBatchSize = 1000
+LogPollInterval = '15s'
+LogKeepBlocksDepth = 100000
+# CCIP uses paging when removing logs to avoid pushing too much pressure on the database
+LogPrunePageSize = 10000
+BackupLogPollerBlockDelay = 100
+MinContractPayment = '.00001 link'
+MinIncomingConfirmations = 3
+NonceAutoSync = true
+NoNewHeadsThreshold = '3m'
+RPCDefaultBatchSize = 250
+RPCBlockQueryDelay = 1
+FinalizedBlockOffset = 0
+NoNewFinalizedHeadsThreshold = '0'
+LogBroadcasterEnabled = true
+
+[Transactions]
+ForwardersEnabled = false
+MaxInFlight = 16
+MaxQueued = 250
+ReaperInterval = '1h'
+ReaperThreshold = '168h'
+ResendAfterThreshold = '1m'
+
+[Transactions.AutoPurge]
+Enabled = false
+
+[BalanceMonitor]
+Enabled = true
+
+[GasEstimator]
+Mode = 'BlockHistory'
+PriceDefault = '20 gwei'
+PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
+PriceMin = '1 gwei'
+LimitDefault = 8_000_000
+LimitMax = 8_000_000
+LimitMultiplier = '1'
+LimitTransfer = 21_000
+BumpMin = '5 gwei'
+BumpPercent = 20
+BumpThreshold = 3
+EIP1559DynamicFees = false
+FeeCapDefault = '100 gwei'
+TipCapDefault = '1'
+TipCapMin = '1'
+EstimateLimit = false
+
+[GasEstimator.BlockHistory]
+BatchSize = 25
+BlockHistorySize = 8
+CheckInclusionBlocks = 12
+CheckInclusionPercentile = 90
+TransactionPercentile = 60
+
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
+[HeadTracker]
+HistoryDepth = 100
+MaxBufferSize = 3
+SamplingInterval = '1s'
+FinalityTagBypass = true
+MaxAllowedFinalityDepth = 10000
+
+[NodePool]
+PollFailureThreshold = 5
+PollInterval = '10s'
+SelectionMode = 'HighestHead'
+SyncThreshold = 5
+LeaseDuration = '0s'
+NodeIsSyncingEnabled = false
+FinalizedBlockPollInterval = '5s'
+EnforceRepeatableRead = false
+DeathDeclarationDelay = '10s'
+NewHeadsPollInterval = '0s'
+
+[OCR]
+ContractConfirmations = 4
+ContractTransmitterTransmitTimeout = '10s'
+DatabaseTimeout = '10s'
+DeltaCOverride = '168h'
+DeltaCJitterOverride = '1h'
+ObservationGracePeriod = '1s'
+
+[OCR2.Automation]
+GasLimit = 5400000
+
+[Workflow]
+GasLimitDefault = 400_000
diff --git a/ccip/config/evm/zkSync_Mainnet.toml b/ccip/config/evm/zkSync_Mainnet.toml
index a8910a37e4a..a29098690b4 100644
--- a/ccip/config/evm/zkSync_Mainnet.toml
+++ b/ccip/config/evm/zkSync_Mainnet.toml
@@ -28,4 +28,4 @@ OracleType = 'zksync'
 
 [HeadTracker]
 # tracks top N blocks to keep in heads database table. Should store atleast the same # of blocks as finalityDepth
-HistoryDepth = 1500
\ No newline at end of file
+HistoryDepth = 1500
diff --git a/ccip/config/evm/zkSync_Sepolia.toml b/ccip/config/evm/zkSync_Sepolia.toml
index 6eb4ba4137e..36b0c9282da 100644
--- a/ccip/config/evm/zkSync_Sepolia.toml
+++ b/ccip/config/evm/zkSync_Sepolia.toml
@@ -1,23 +1,23 @@
 ChainID = '300'
 ChainType = 'zksync'
 # 200block ~ 20min concurrent with the l1_committed tag
-FinalityDepth = 200  
+FinalityDepth = 200
 # block rate is ~2-5sec, so this ensures blocks are polled correctly
 LogPollInterval = '5s'
 # sufficient time for RPC to be labelled out of sync, since blockRate is pretty fast
 NoNewHeadsThreshold = '1m'
 
 [GasEstimator]
-# no EIP1559 to ensure our estimator doesnot estimate gas with MaxPriorityFee which will break minFunding requirement 
-EIP1559DynamicFees = false 
-# high LimitDefault for worst case pubdata bytes with BatchGasLimit reduced to 4M in OCR2Config  
+# no EIP1559 to ensure our estimator doesnot estimate gas with MaxPriorityFee which will break minFunding requirement
+EIP1559DynamicFees = false
+# high LimitDefault for worst case pubdata bytes with BatchGasLimit reduced to 4M in OCR2Config
 LimitDefault = 2_500_000_000
 FeeCapDefault = '500 mwei'
 PriceDefault = '25 mwei'
 # p999 value for gasPrice based on historical data
 PriceMax = '500 mwei'
 # avg gasPrices are at 0.025 gwei
-PriceMin = '25 mwei' 
+PriceMin = '25 mwei'
 
 [GasEstimator.BlockHistory]
 # increasing this to smooth out gas estimation
@@ -28,4 +28,7 @@ OracleType = 'zksync'
 
 [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://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false