diff --git a/arb/nitro/alephzero-mainnet-nitro-pruned-pebble-path.yml b/arb/nitro/alephzero-mainnet-nitro-pruned-pebble-path.yml
index 1c5dbead..14405a1a 100644
--- a/arb/nitro/alephzero-mainnet-nitro-pruned-pebble-path.yml
+++ b/arb/nitro/alephzero-mainnet-nitro-pruned-pebble-path.yml
@@ -57,7 +57,6 @@ services:
       - --execution.caching.trie-dirty-cache=${ALEPHZERO_MAINNET_NITRO_PRUNED_PEBBLE_PATH_TRIE_DIRTY_CACHE:-1024}
       - --execution.forwarding-target=https://rpc.alephzero.raas.gelato.cloud
       - --execution.rpc.gas-cap=5500000000
-      - --execution.rpc.state-scheme=path
       - --execution.sequencer.enable=false
       - --http.addr=0.0.0.0
       - --http.api=eth,net,web3,arb,txpool,debug
diff --git a/arb/nitro/alephzero-sepolia-nitro-pruned-pebble-path.yml b/arb/nitro/alephzero-sepolia-nitro-pruned-pebble-path.yml
index 5ed50303..b838522c 100644
--- a/arb/nitro/alephzero-sepolia-nitro-pruned-pebble-path.yml
+++ b/arb/nitro/alephzero-sepolia-nitro-pruned-pebble-path.yml
@@ -57,7 +57,6 @@ services:
       - --execution.caching.trie-dirty-cache=${ALEPHZERO_SEPOLIA_NITRO_PRUNED_PEBBLE_PATH_TRIE_DIRTY_CACHE:-1024}
       - --execution.forwarding-target=https://rpc.alephzero-testnet.gelato.digital
       - --execution.rpc.gas-cap=5500000000
-      - --execution.rpc.state-scheme=path
       - --execution.sequencer.enable=false
       - --http.addr=0.0.0.0
       - --http.api=eth,net,web3,arb,txpool,debug
diff --git a/arb/nitro/connext-sepolia-nitro-pruned-pebble-path.yml b/arb/nitro/connext-sepolia-nitro-pruned-pebble-path.yml
index 271614f1..8e43f57a 100644
--- a/arb/nitro/connext-sepolia-nitro-pruned-pebble-path.yml
+++ b/arb/nitro/connext-sepolia-nitro-pruned-pebble-path.yml
@@ -57,7 +57,6 @@ services:
       - --execution.caching.trie-dirty-cache=${CONNEXT_SEPOLIA_NITRO_PRUNED_PEBBLE_PATH_TRIE_DIRTY_CACHE:-1024}
       - --execution.forwarding-target=https://rpc.connext-sepolia.gelato.digital
       - --execution.rpc.gas-cap=5500000000
-      - --execution.rpc.state-scheme=path
       - --execution.sequencer.enable=false
       - --http.addr=0.0.0.0
       - --http.api=eth,net,web3,arb,txpool,debug
diff --git a/arb/nitro/everclear-mainnet-nitro-pruned-pebble-path.yml b/arb/nitro/everclear-mainnet-nitro-pruned-pebble-path.yml
index a680006e..5457ac40 100644
--- a/arb/nitro/everclear-mainnet-nitro-pruned-pebble-path.yml
+++ b/arb/nitro/everclear-mainnet-nitro-pruned-pebble-path.yml
@@ -57,7 +57,6 @@ services:
       - --execution.caching.trie-dirty-cache=${EVERCLEAR_MAINNET_NITRO_PRUNED_PEBBLE_PATH_TRIE_DIRTY_CACHE:-1024}
       - --execution.forwarding-target=https://rpc.everclear.raas.gelato.cloud
       - --execution.rpc.gas-cap=5500000000
-      - --execution.rpc.state-scheme=path
       - --execution.sequencer.enable=false
       - --http.addr=0.0.0.0
       - --http.api=eth,net,web3,arb,txpool,debug
diff --git a/arb/nitro/opencampuscodex-sepolia-nitro-pruned-pebble-path.yml b/arb/nitro/opencampuscodex-sepolia-nitro-pruned-pebble-path.yml
index 36048d79..f76e3200 100644
--- a/arb/nitro/opencampuscodex-sepolia-nitro-pruned-pebble-path.yml
+++ b/arb/nitro/opencampuscodex-sepolia-nitro-pruned-pebble-path.yml
@@ -57,7 +57,6 @@ services:
       - --execution.caching.trie-dirty-cache=${OPENCAMPUSCODEX_SEPOLIA_NITRO_PRUNED_PEBBLE_PATH_TRIE_DIRTY_CACHE:-1024}
       - --execution.forwarding-target=https://rpc.open-campus-codex.gelato.digital
       - --execution.rpc.gas-cap=5500000000
-      - --execution.rpc.state-scheme=path
       - --execution.sequencer.enable=false
       - --http.addr=0.0.0.0
       - --http.api=eth,net,web3,arb,txpool,debug
diff --git a/arb/nitro/playblock-mainnet-nitro-pruned-pebble-path.yml b/arb/nitro/playblock-mainnet-nitro-pruned-pebble-path.yml
index 6a97e320..896cbe66 100644
--- a/arb/nitro/playblock-mainnet-nitro-pruned-pebble-path.yml
+++ b/arb/nitro/playblock-mainnet-nitro-pruned-pebble-path.yml
@@ -57,7 +57,6 @@ services:
       - --execution.caching.trie-dirty-cache=${PLAYBLOCK_MAINNET_NITRO_PRUNED_PEBBLE_PATH_TRIE_DIRTY_CACHE:-1024}
       - --execution.forwarding-target=https://rpc.playblock.io
       - --execution.rpc.gas-cap=5500000000
-      - --execution.rpc.state-scheme=path
       - --execution.sequencer.enable=false
       - --http.addr=0.0.0.0
       - --http.api=eth,net,web3,arb,txpool,debug
diff --git a/arb/nitro/plume-mainnet-nitro-pruned-pebble-path.yml b/arb/nitro/plume-mainnet-nitro-pruned-pebble-path.yml
index 3d82b106..02f753ae 100644
--- a/arb/nitro/plume-mainnet-nitro-pruned-pebble-path.yml
+++ b/arb/nitro/plume-mainnet-nitro-pruned-pebble-path.yml
@@ -57,7 +57,6 @@ services:
       - --execution.caching.trie-dirty-cache=${PLUME_MAINNET_NITRO_PRUNED_PEBBLE_PATH_TRIE_DIRTY_CACHE:-1024}
       - --execution.forwarding-target=https://rpc.plume.org
       - --execution.rpc.gas-cap=5500000000
-      - --execution.rpc.state-scheme=path
       - --execution.sequencer.enable=false
       - --http.addr=0.0.0.0
       - --http.api=eth,net,web3,arb,txpool,debug
diff --git a/arb/nitro/plume-testnet-nitro-pruned-pebble-path.yml b/arb/nitro/plume-testnet-nitro-pruned-pebble-path.yml
index fdf7241f..fa7c41b5 100644
--- a/arb/nitro/plume-testnet-nitro-pruned-pebble-path.yml
+++ b/arb/nitro/plume-testnet-nitro-pruned-pebble-path.yml
@@ -57,7 +57,6 @@ services:
       - --execution.caching.trie-dirty-cache=${PLUME_TESTNET_NITRO_PRUNED_PEBBLE_PATH_TRIE_DIRTY_CACHE:-1024}
       - --execution.forwarding-target=https://testnet-rpc.plume.org
       - --execution.rpc.gas-cap=5500000000
-      - --execution.rpc.state-scheme=path
       - --execution.sequencer.enable=false
       - --http.addr=0.0.0.0
       - --http.api=eth,net,web3,arb,txpool,debug
diff --git a/arb/nitro/real-mainnet-nitro-pruned-pebble-path.yml b/arb/nitro/real-mainnet-nitro-pruned-pebble-path.yml
index 428dd8f5..0e734d10 100644
--- a/arb/nitro/real-mainnet-nitro-pruned-pebble-path.yml
+++ b/arb/nitro/real-mainnet-nitro-pruned-pebble-path.yml
@@ -57,7 +57,6 @@ services:
       - --execution.caching.trie-dirty-cache=${REAL_MAINNET_NITRO_PRUNED_PEBBLE_PATH_TRIE_DIRTY_CACHE:-1024}
       - --execution.forwarding-target=https://rpc.realforreal.gelato.digital
       - --execution.rpc.gas-cap=5500000000
-      - --execution.rpc.state-scheme=path
       - --execution.sequencer.enable=false
       - --http.addr=0.0.0.0
       - --http.api=eth,net,web3,arb,txpool,debug
diff --git a/op/geth/boba-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/boba-mainnet-op-geth-archive-leveldb-hash.yml
index dc06bc85..462388d3 100644
--- a/op/geth/boba-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/boba-mainnet-op-geth-archive-leveldb-hash.yml
@@ -51,8 +51,6 @@ services:
       - 8551
     environment:
       - GETH_OP_NETWORK=boba-mainnet
-      - GETH_OVERRIDE_FJORD=1725951600
-      - GETH_OVERRIDE_GRANITE=1729753200
       - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
       - GETH_ROLLUP_SEQUENCERHTTP=https://mainnet.boba.network
     entrypoint: /bin/sh -c 'exec geth "$@"' --
diff --git a/op/geth/boba-mainnet-op-geth-pruned-leveldb-hash.yml b/op/geth/boba-mainnet-op-geth-pruned-leveldb-hash.yml
index 93500f46..453070d7 100644
--- a/op/geth/boba-mainnet-op-geth-pruned-leveldb-hash.yml
+++ b/op/geth/boba-mainnet-op-geth-pruned-leveldb-hash.yml
@@ -51,8 +51,6 @@ services:
       - 8551
     environment:
       - GETH_OP_NETWORK=boba-mainnet
-      - GETH_OVERRIDE_FJORD=1725951600
-      - GETH_OVERRIDE_GRANITE=1729753200
       - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
       - GETH_ROLLUP_SEQUENCERHTTP=https://mainnet.boba.network
     entrypoint: /bin/sh -c 'exec geth "$@"' --