diff --git a/op/geth/blast-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/blast-mainnet-op-geth-archive-leveldb-hash.yml
index 26121ba2..d64a66a9 100644
--- a/op/geth/blast-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/blast-mainnet-op-geth-archive-leveldb-hash.yml
@@ -97,7 +97,7 @@ services:
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
-      - OP_NODE_SYNCMODE=consensus-layer
+      - OP_NODE_SYNCMODE=execution-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
     entrypoint: [op-node]
     restart: unless-stopped
diff --git a/op/geth/blast-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/blast-mainnet-op-geth-pruned-pebble-path.yml
index bb90a9ac..0473b3bf 100644
--- a/op/geth/blast-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/blast-mainnet-op-geth-pruned-pebble-path.yml
@@ -97,7 +97,7 @@ services:
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
-      - OP_NODE_SYNCMODE=consensus-layer
+      - OP_NODE_SYNCMODE=execution-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
     entrypoint: [op-node]
     restart: unless-stopped
diff --git a/op/geth/blast-sepolia-op-geth-pruned-pebble-hash.yml b/op/geth/blast-sepolia-op-geth-pruned-pebble-hash.yml
index 3f96f08c..f05f7ea0 100644
--- a/op/geth/blast-sepolia-op-geth-pruned-pebble-hash.yml
+++ b/op/geth/blast-sepolia-op-geth-pruned-pebble-hash.yml
@@ -100,7 +100,7 @@ services:
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
-      - OP_NODE_SYNCMODE=consensus-layer
+      - OP_NODE_SYNCMODE=execution-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
     entrypoint: [op-node]
     restart: unless-stopped
diff --git a/op/geth/fraxtal-testnet-op-geth-archive-leveldb-hash.yml b/op/geth/fraxtal-testnet-op-geth-archive-leveldb-hash.yml
index 20029f7f..4c7df4e3 100644
--- a/op/geth/fraxtal-testnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/fraxtal-testnet-op-geth-archive-leveldb-hash.yml
@@ -82,7 +82,6 @@ services:
       - 15370:15370
       - 15370:15370/udp
     environment:
-      - OP_NODE_DA_RPC=https://da-rpc.testnet.frax.com
       - OP_NODE_L1_BEACON=${ETHEREUM_SEPOLIA_BEACON_REST}
       - OP_NODE_L1_BEACON_ARCHIVER=${ETHEREUM_SEPOLIA_BEACON_ARCHIVER}
       - OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}
diff --git a/op/geth/fraxtal-testnet-op-geth-pruned-pebble-path.yml b/op/geth/fraxtal-testnet-op-geth-pruned-pebble-path.yml
index 376020f6..7e36354e 100644
--- a/op/geth/fraxtal-testnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/fraxtal-testnet-op-geth-pruned-pebble-path.yml
@@ -43,7 +43,7 @@ services:
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
       - --state.scheme=path
-      - --syncmode=snap
+      - --syncmode=full
       - --http
       - --http.addr=0.0.0.0
       - --http.api=eth,net,web3,debug,admin,txpool,engine
@@ -82,7 +82,6 @@ services:
       - 15370:15370
       - 15370:15370/udp
     environment:
-      - OP_NODE_DA_RPC=https://da-rpc.testnet.frax.com
       - OP_NODE_L1_BEACON=${ETHEREUM_SEPOLIA_BEACON_REST}
       - OP_NODE_L1_BEACON_ARCHIVER=${ETHEREUM_SEPOLIA_BEACON_ARCHIVER}
       - OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}
diff --git a/op/geth/manta-pacific-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/manta-pacific-mainnet-op-geth-archive-leveldb-hash.yml
index b8a79f4a..1d0e4b2e 100644
--- a/op/geth/manta-pacific-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/manta-pacific-mainnet-op-geth-archive-leveldb-hash.yml
@@ -97,7 +97,7 @@ services:
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
-      - OP_NODE_SYNCMODE=execution-layer
+      - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
     entrypoint: [op-node]
     restart: unless-stopped
diff --git a/op/geth/manta-pacific-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/manta-pacific-mainnet-op-geth-pruned-pebble-path.yml
index 32ce8d11..bbfe4131 100644
--- a/op/geth/manta-pacific-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/manta-pacific-mainnet-op-geth-pruned-pebble-path.yml
@@ -38,7 +38,7 @@ services:
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
       - --state.scheme=path
-      - --syncmode=snap
+      - --syncmode=full
       - --http
       - --http.addr=0.0.0.0
       - --http.api=web3,net,eth,debug,admin
@@ -97,7 +97,7 @@ services:
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
-      - OP_NODE_SYNCMODE=execution-layer
+      - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
     entrypoint: [op-node]
     restart: unless-stopped
diff --git a/op/geth/mantle-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/mantle-mainnet-op-geth-archive-leveldb-hash.yml
index f8a16555..21aebad5 100644
--- a/op/geth/mantle-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/mantle-mainnet-op-geth-archive-leveldb-hash.yml
@@ -100,11 +100,10 @@ services:
       - OP_NODE_P2P_LISTEN_TCP_PORT=15067
       - OP_NODE_P2P_LISTEN_UDP_PORT=15067
       - OP_NODE_P2P_STATIC_PEERS=/dns4/peer0.mantle.xyz/tcp/9003/p2p/16Uiu2HAmKVKzUAns2gLhZAz1PYcbnhY3WpxNxUZYeTN1x29tNBAW,/dns4/peer1.mantle.xyz/tcp/9003/p2p/16Uiu2HAm1AiZtVp8f5C8LvpSTAXC6GtwqAVKnB3VLawWYSEBmcFN,/dns4/peer2.mantle.xyz/tcp/9003/p2p/16Uiu2HAm2UHVKiPXpovs8VbbUQVPr7feBAqBJdFsH1z5XDiLEvHT
-      - OP_NODE_P2P_SYNCMODE=consensus-layer
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
-      - OP_NODE_SYNCMODE=execution-layer
+      - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
     entrypoint: [op-node]
     restart: unless-stopped
diff --git a/op/geth/mantle-mainnet-op-geth-pruned-leveldb-hash.yml b/op/geth/mantle-mainnet-op-geth-pruned-leveldb-hash.yml
index 2d6e37d4..02d7d8ef 100644
--- a/op/geth/mantle-mainnet-op-geth-pruned-leveldb-hash.yml
+++ b/op/geth/mantle-mainnet-op-geth-pruned-leveldb-hash.yml
@@ -40,7 +40,7 @@ services:
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
       - --state.scheme=hash
-      - --syncmode=snap
+      - --syncmode=full
       - --http
       - --http.addr=0.0.0.0
       - --http.api=eth,net,web3,debug,admin,txpool,engine
@@ -100,11 +100,10 @@ services:
       - OP_NODE_P2P_LISTEN_TCP_PORT=15067
       - OP_NODE_P2P_LISTEN_UDP_PORT=15067
       - OP_NODE_P2P_STATIC_PEERS=/dns4/peer0.mantle.xyz/tcp/9003/p2p/16Uiu2HAmKVKzUAns2gLhZAz1PYcbnhY3WpxNxUZYeTN1x29tNBAW,/dns4/peer1.mantle.xyz/tcp/9003/p2p/16Uiu2HAm1AiZtVp8f5C8LvpSTAXC6GtwqAVKnB3VLawWYSEBmcFN,/dns4/peer2.mantle.xyz/tcp/9003/p2p/16Uiu2HAm2UHVKiPXpovs8VbbUQVPr7feBAqBJdFsH1z5XDiLEvHT
-      - OP_NODE_P2P_SYNCMODE=consensus-layer
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
-      - OP_NODE_SYNCMODE=execution-layer
+      - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
     entrypoint: [op-node]
     restart: unless-stopped
diff --git a/op/geth/mantle-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/mantle-sepolia-op-geth-archive-leveldb-hash.yml
index ee85a35f..826ebce2 100644
--- a/op/geth/mantle-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/mantle-sepolia-op-geth-archive-leveldb-hash.yml
@@ -96,7 +96,7 @@ services:
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
-      - OP_NODE_SYNCMODE=execution-layer
+      - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
     entrypoint: [op-node]
     restart: unless-stopped
diff --git a/op/geth/mantle-sepolia-op-geth-pruned-leveldb-hash.yml b/op/geth/mantle-sepolia-op-geth-pruned-leveldb-hash.yml
index 80721151..86ea3dca 100644
--- a/op/geth/mantle-sepolia-op-geth-pruned-leveldb-hash.yml
+++ b/op/geth/mantle-sepolia-op-geth-pruned-leveldb-hash.yml
@@ -38,7 +38,7 @@ services:
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
       - --state.scheme=hash
-      - --syncmode=snap
+      - --syncmode=full
       - --http
       - --http.addr=0.0.0.0
       - --http.api=eth,net,web3,debug,admin,txpool,engine
@@ -96,7 +96,7 @@ services:
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
-      - OP_NODE_SYNCMODE=execution-layer
+      - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
     entrypoint: [op-node]
     restart: unless-stopped
diff --git a/op/geth/metal-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/metal-sepolia-op-geth-pruned-pebble-path.yml
index 53ce3a7b..296b9cdc 100644
--- a/op/geth/metal-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/metal-sepolia-op-geth-pruned-pebble-path.yml
@@ -38,7 +38,7 @@ services:
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
       - --state.scheme=path
-      - --syncmode=snap
+      - --syncmode=full
       - --http
       - --http.addr=0.0.0.0
       - --http.api=eth,net,web3,debug,admin,txpool,engine