diff --git a/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml b/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml
index fd4dd9f32f0..4a549389a6f 100644
--- a/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml
@@ -1,6 +1,7 @@
 ChainID = '10'
 ChainType = 'optimismBedrock'
-FinalityDepth = 200
+FinalityDepth = 1000
+FinalityTagEnabled = true
 LinkContractAddress = '0x350a791Bfc2C21F9Ed5d10980Dad2e2638ffa7f6'
 LogPollInterval = '2s'
 NoNewHeadsThreshold = '40s'
@@ -18,7 +19,7 @@ BlockHistorySize = 24
 ResendAfterThreshold = '30s'
 
 [HeadTracker]
-HistoryDepth = 300
+HistoryDepth = 1100
 
 [NodePool]
 SyncThreshold = 10
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index 91c5440ba29..24ba497b995 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -2076,8 +2076,8 @@ AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
 ChainType = 'optimismBedrock'
-FinalityDepth = 200
-FinalityTagEnabled = false
+FinalityDepth = 1000
+FinalityTagEnabled = true
 LinkContractAddress = '0x350a791Bfc2C21F9Ed5d10980Dad2e2638ffa7f6'
 LogBackfillBatchSize = 1000
 LogPollInterval = '2s'
@@ -2127,7 +2127,7 @@ CheckInclusionPercentile = 90
 TransactionPercentile = 60
 
 [HeadTracker]
-HistoryDepth = 300
+HistoryDepth = 1100
 MaxBufferSize = 3
 SamplingInterval = '1s'