diff --git a/berachain/reth/berachain-bartio-reth-archive-trace.yml b/berachain/reth/berachain-bartio-reth-archive-trace.yml
index 069e5540..a2b04872 100644
--- a/berachain/reth/berachain-bartio-reth-archive-trace.yml
+++ b/berachain/reth/berachain-bartio-reth-archive-trace.yml
@@ -98,6 +98,7 @@ services:
       - --engine.always-process-payload-attributes-on-canonical-head
       - --engine.cross-block-cache-size=${BERACHAIN_BARTIO_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --max-inbound-peers=50
       - --max-outbound-peers=50
diff --git a/berachain/reth/berachain-bartio-reth-pruned-trace.yml b/berachain/reth/berachain-bartio-reth-pruned-trace.yml
index ccb3cd41..6dc737d1 100644
--- a/berachain/reth/berachain-bartio-reth-pruned-trace.yml
+++ b/berachain/reth/berachain-bartio-reth-pruned-trace.yml
@@ -98,6 +98,7 @@ services:
       - --engine.always-process-payload-attributes-on-canonical-head
       - --engine.cross-block-cache-size=${BERACHAIN_BARTIO_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --full
       - --max-inbound-peers=50
diff --git a/berachain/reth/berachain-bepolia-reth-archive-trace.yml b/berachain/reth/berachain-bepolia-reth-archive-trace.yml
index 9d447d75..b3fb7fab 100644
--- a/berachain/reth/berachain-bepolia-reth-archive-trace.yml
+++ b/berachain/reth/berachain-bepolia-reth-archive-trace.yml
@@ -98,6 +98,7 @@ services:
       - --engine.always-process-payload-attributes-on-canonical-head
       - --engine.cross-block-cache-size=${BERACHAIN_BEPOLIA_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --max-inbound-peers=50
       - --max-outbound-peers=50
diff --git a/berachain/reth/berachain-bepolia-reth-pruned-trace.yml b/berachain/reth/berachain-bepolia-reth-pruned-trace.yml
index fa487bd6..f1609eb7 100644
--- a/berachain/reth/berachain-bepolia-reth-pruned-trace.yml
+++ b/berachain/reth/berachain-bepolia-reth-pruned-trace.yml
@@ -98,6 +98,7 @@ services:
       - --engine.always-process-payload-attributes-on-canonical-head
       - --engine.cross-block-cache-size=${BERACHAIN_BEPOLIA_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --full
       - --max-inbound-peers=50
diff --git a/berachain/reth/berachain-mainnet-reth-archive-trace.yml b/berachain/reth/berachain-mainnet-reth-archive-trace.yml
index 11e85059..7056cb88 100644
--- a/berachain/reth/berachain-mainnet-reth-archive-trace.yml
+++ b/berachain/reth/berachain-mainnet-reth-archive-trace.yml
@@ -98,6 +98,7 @@ services:
       - --engine.always-process-payload-attributes-on-canonical-head
       - --engine.cross-block-cache-size=${BERACHAIN_MAINNET_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --max-inbound-peers=50
       - --max-outbound-peers=50
diff --git a/berachain/reth/berachain-mainnet-reth-pruned-trace.yml b/berachain/reth/berachain-mainnet-reth-pruned-trace.yml
index da088b5d..ef97b3dc 100644
--- a/berachain/reth/berachain-mainnet-reth-pruned-trace.yml
+++ b/berachain/reth/berachain-mainnet-reth-pruned-trace.yml
@@ -98,6 +98,7 @@ services:
       - --engine.always-process-payload-attributes-on-canonical-head
       - --engine.cross-block-cache-size=${BERACHAIN_MAINNET_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --full
       - --max-inbound-peers=50
diff --git a/ethereum/reth/ethereum-hoodi-reth-archive-trace.yml b/ethereum/reth/ethereum-hoodi-reth-archive-trace.yml
index f8ed3e76..5f9018f9 100644
--- a/ethereum/reth/ethereum-hoodi-reth-archive-trace.yml
+++ b/ethereum/reth/ethereum-hoodi-reth-archive-trace.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=10606
       - --engine.cross-block-cache-size=${ETHEREUM_HOODI_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --gpo.ignoreprice=2
       - --max-inbound-peers=50
diff --git a/ethereum/reth/ethereum-hoodi-reth-pruned-trace.yml b/ethereum/reth/ethereum-hoodi-reth-pruned-trace.yml
index bcc2cc33..bcd3a052 100644
--- a/ethereum/reth/ethereum-hoodi-reth-pruned-trace.yml
+++ b/ethereum/reth/ethereum-hoodi-reth-pruned-trace.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=12435
       - --engine.cross-block-cache-size=${ETHEREUM_HOODI_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --full
       - --gpo.ignoreprice=2
diff --git a/ethereum/reth/ethereum-mainnet-reth-archive-trace--lighthouse-pruned-blobs.yml b/ethereum/reth/ethereum-mainnet-reth-archive-trace--lighthouse-pruned-blobs.yml
index ebbdcc42..40c0c492 100644
--- a/ethereum/reth/ethereum-mainnet-reth-archive-trace--lighthouse-pruned-blobs.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-archive-trace--lighthouse-pruned-blobs.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=14563
       - --engine.cross-block-cache-size=${ETHEREUM_MAINNET_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --gpo.ignoreprice=2
       - --max-inbound-peers=50
diff --git a/ethereum/reth/ethereum-mainnet-reth-archive-trace--nimbus.yml b/ethereum/reth/ethereum-mainnet-reth-archive-trace--nimbus.yml
index 05511762..41651bec 100644
--- a/ethereum/reth/ethereum-mainnet-reth-archive-trace--nimbus.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-archive-trace--nimbus.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=14563
       - --engine.cross-block-cache-size=${ETHEREUM_MAINNET_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --gpo.ignoreprice=2
       - --max-inbound-peers=50
diff --git a/ethereum/reth/ethereum-mainnet-reth-archive-trace.yml b/ethereum/reth/ethereum-mainnet-reth-archive-trace.yml
index ceedbe4d..4456c1bf 100644
--- a/ethereum/reth/ethereum-mainnet-reth-archive-trace.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-archive-trace.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=14563
       - --engine.cross-block-cache-size=${ETHEREUM_MAINNET_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --gpo.ignoreprice=2
       - --max-inbound-peers=50
diff --git a/ethereum/reth/ethereum-mainnet-reth-minimal-trace--blsync.yml b/ethereum/reth/ethereum-mainnet-reth-minimal-trace--blsync.yml
index 76fe1e01..7b2101c9 100644
--- a/ethereum/reth/ethereum-mainnet-reth-minimal-trace--blsync.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-minimal-trace--blsync.yml
@@ -63,6 +63,7 @@ services:
       - --discovery.port=14286
       - --engine.cross-block-cache-size=${ETHEREUM_MAINNET_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --full
       - --gpo.ignoreprice=2
diff --git a/ethereum/reth/ethereum-mainnet-reth-minimal-trace--nimbus.yml b/ethereum/reth/ethereum-mainnet-reth-minimal-trace--nimbus.yml
index fb683119..d7288781 100644
--- a/ethereum/reth/ethereum-mainnet-reth-minimal-trace--nimbus.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-minimal-trace--nimbus.yml
@@ -85,6 +85,7 @@ services:
       - --discovery.port=14286
       - --engine.cross-block-cache-size=${ETHEREUM_MAINNET_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --full
       - --gpo.ignoreprice=2
diff --git a/ethereum/reth/ethereum-mainnet-reth-pruned-trace--lighthouse.yml b/ethereum/reth/ethereum-mainnet-reth-pruned-trace--lighthouse.yml
index 9175d726..ee85458e 100644
--- a/ethereum/reth/ethereum-mainnet-reth-pruned-trace--lighthouse.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-pruned-trace--lighthouse.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=10150
       - --engine.cross-block-cache-size=${ETHEREUM_MAINNET_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --full
       - --gpo.ignoreprice=2
diff --git a/ethereum/reth/ethereum-mainnet-reth-pruned-trace--nimbus.yml b/ethereum/reth/ethereum-mainnet-reth-pruned-trace--nimbus.yml
index 9c7414f2..76f12807 100644
--- a/ethereum/reth/ethereum-mainnet-reth-pruned-trace--nimbus.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-pruned-trace--nimbus.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=10150
       - --engine.cross-block-cache-size=${ETHEREUM_MAINNET_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --full
       - --gpo.ignoreprice=2
diff --git a/ethereum/reth/ethereum-mainnet-reth-pruned-trace.yml b/ethereum/reth/ethereum-mainnet-reth-pruned-trace.yml
index 185e4c0f..ba5f87a5 100644
--- a/ethereum/reth/ethereum-mainnet-reth-pruned-trace.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-pruned-trace.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=10150
       - --engine.cross-block-cache-size=${ETHEREUM_MAINNET_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --full
       - --gpo.ignoreprice=2
diff --git a/ethereum/reth/ethereum-sepolia-reth-archive-trace--nimbus.yml b/ethereum/reth/ethereum-sepolia-reth-archive-trace--nimbus.yml
index 5c8ce208..ffd9d54d 100644
--- a/ethereum/reth/ethereum-sepolia-reth-archive-trace--nimbus.yml
+++ b/ethereum/reth/ethereum-sepolia-reth-archive-trace--nimbus.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=14330
       - --engine.cross-block-cache-size=${ETHEREUM_SEPOLIA_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --gpo.ignoreprice=2
       - --max-inbound-peers=50
diff --git a/ethereum/reth/ethereum-sepolia-reth-archive-trace.yml b/ethereum/reth/ethereum-sepolia-reth-archive-trace.yml
index a3a70f9f..a71cf506 100644
--- a/ethereum/reth/ethereum-sepolia-reth-archive-trace.yml
+++ b/ethereum/reth/ethereum-sepolia-reth-archive-trace.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=14330
       - --engine.cross-block-cache-size=${ETHEREUM_SEPOLIA_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --gpo.ignoreprice=2
       - --max-inbound-peers=50
diff --git a/ethereum/reth/ethereum-sepolia-reth-pruned-trace--nimbus.yml b/ethereum/reth/ethereum-sepolia-reth-pruned-trace--nimbus.yml
index c0c87bcc..204434d7 100644
--- a/ethereum/reth/ethereum-sepolia-reth-pruned-trace--nimbus.yml
+++ b/ethereum/reth/ethereum-sepolia-reth-pruned-trace--nimbus.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=12150
       - --engine.cross-block-cache-size=${ETHEREUM_SEPOLIA_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --full
       - --gpo.ignoreprice=2
diff --git a/ethereum/reth/ethereum-sepolia-reth-pruned-trace.yml b/ethereum/reth/ethereum-sepolia-reth-pruned-trace.yml
index c6962819..d3682958 100644
--- a/ethereum/reth/ethereum-sepolia-reth-pruned-trace.yml
+++ b/ethereum/reth/ethereum-sepolia-reth-pruned-trace.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=12150
       - --engine.cross-block-cache-size=${ETHEREUM_SEPOLIA_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --full
       - --gpo.ignoreprice=2
diff --git a/gnosis/reth/gnosis-chiado-reth-archive-trace.yml b/gnosis/reth/gnosis-chiado-reth-archive-trace.yml
index 7b3168df..9558502b 100644
--- a/gnosis/reth/gnosis-chiado-reth-archive-trace.yml
+++ b/gnosis/reth/gnosis-chiado-reth-archive-trace.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=13769
       - --engine.cross-block-cache-size=${GNOSIS_CHIADO_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --max-inbound-peers=50
       - --max-outbound-peers=50
diff --git a/gnosis/reth/gnosis-chiado-reth-pruned-trace.yml b/gnosis/reth/gnosis-chiado-reth-pruned-trace.yml
index 2bb991d5..314f4c89 100644
--- a/gnosis/reth/gnosis-chiado-reth-pruned-trace.yml
+++ b/gnosis/reth/gnosis-chiado-reth-pruned-trace.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=10751
       - --engine.cross-block-cache-size=${GNOSIS_CHIADO_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --full
       - --max-inbound-peers=50
diff --git a/gnosis/reth/gnosis-mainnet-reth-archive-trace.yml b/gnosis/reth/gnosis-mainnet-reth-archive-trace.yml
index 05e4ede7..20b1c565 100644
--- a/gnosis/reth/gnosis-mainnet-reth-archive-trace.yml
+++ b/gnosis/reth/gnosis-mainnet-reth-archive-trace.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=14921
       - --engine.cross-block-cache-size=${GNOSIS_MAINNET_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --max-inbound-peers=50
       - --max-outbound-peers=50
diff --git a/gnosis/reth/gnosis-mainnet-reth-pruned-trace.yml b/gnosis/reth/gnosis-mainnet-reth-pruned-trace.yml
index 4c645ebf..762fa482 100644
--- a/gnosis/reth/gnosis-mainnet-reth-pruned-trace.yml
+++ b/gnosis/reth/gnosis-mainnet-reth-pruned-trace.yml
@@ -60,6 +60,7 @@ services:
       - --discovery.port=13516
       - --engine.cross-block-cache-size=${GNOSIS_MAINNET_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --full
       - --max-inbound-peers=50
diff --git a/op/reth/worldchain-mainnet-op-reth-pruned-trace--kona.yml b/op/reth/worldchain-mainnet-op-reth-pruned-trace--kona.yml
index e0ab9f31..8cd53456 100644
--- a/op/reth/worldchain-mainnet-op-reth-pruned-trace--kona.yml
+++ b/op/reth/worldchain-mainnet-op-reth-pruned-trace--kona.yml
@@ -24,12 +24,12 @@ x-logging-defaults: &logging-defaults
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/worldchain-mainnet-op-reth-pruned \
+# curl -X POST https://${IP}.traefik.me/worldchain-mainnet \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 
 services:
-  worldchain-mainnet-op-reth-pruned:
+  worldchain-mainnet:
     image: ${WORLDCHAIN_RETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-reth}:${WORLDCHAIN_MAINNET_RETH_VERSION:-v2.5.0}
     sysctls:
       # TCP Performance
@@ -104,16 +104,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.worldchain-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/worldchain-mainnet-op-reth-pruned
+      - traefik.http.middlewares.worldchain-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/worldchain-mainnet
       - traefik.http.services.worldchain-mainnet-op-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/worldchain-mainnet-op-reth-pruned`) || Path(`/worldchain-mainnet-op-reth-pruned/`))}
-      - ${NO_SSL:+traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace.rule=Path(`/worldchain-mainnet-op-reth-pruned`) || Path(`/worldchain-mainnet-op-reth-pruned/`)}
+      - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/worldchain-mainnet`) || Path(`/worldchain-mainnet/`))}
+      - ${NO_SSL:+traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace.rule=Path(`/worldchain-mainnet`) || Path(`/worldchain-mainnet/`)}
       - traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace.middlewares=worldchain-mainnet-op-reth-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  worldchain-mainnet-op-reth-pruned-node:
+  worldchain-mainnet-node:
     image: ${WORLDCHAIN_KONA_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/kona-node}:${WORLDCHAIN_MAINNET_KONA_VERSION:-v1.7.0}
     ports:
       - 15216:15216
@@ -125,7 +125,7 @@ services:
       - KONA_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - KONA_NODE_L2_CHAIN_ID=480
       - KONA_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - KONA_NODE_L2_ENGINE_RPC=http://worldchain-mainnet-op-reth-pruned:8551
+      - KONA_NODE_L2_ENGINE_RPC=http://worldchain-mainnet:8551
       - KONA_NODE_L2_ENGINE_TIMEOUT=120000
       - KONA_NODE_L2_TRUST_RPC=true
       - KONA_NODE_METRICS_PORT=7300
@@ -140,7 +140,7 @@ services:
     entrypoint: [kona-node, node]
     restart: unless-stopped
     depends_on:
-      worldchain-mainnet-op-reth-pruned:
+      worldchain-mainnet:
         condition: service_started
         restart: true
     networks:
@@ -153,12 +153,12 @@ services:
       - prometheus-scrape.port=7300
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.worldchain-mainnet-op-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/worldchain-mainnet-op-reth-pruned/node
+      - traefik.http.middlewares.worldchain-mainnet-op-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/worldchain-mainnet/node
       - traefik.http.services.worldchain-mainnet-op-reth-pruned-trace-node.loadbalancer.server.port=9545
       - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/worldchain-mainnet-op-reth-pruned/node`)}
-      - ${NO_SSL:+traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace-node.rule=PathPrefix(`/worldchain-mainnet-op-reth-pruned/node`)}
+      - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/worldchain-mainnet/node`)}
+      - ${NO_SSL:+traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace-node.rule=PathPrefix(`/worldchain-mainnet/node`)}
       - traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace-node.middlewares=worldchain-mainnet-op-reth-pruned-trace-node-stripprefix, ipallowlist
 
 volumes:
diff --git a/op/reth/worldchain-mainnet-op-reth-pruned-trace.yml b/op/reth/worldchain-mainnet-op-reth-pruned-trace.yml
index 4369c462..92b5c7e5 100644
--- a/op/reth/worldchain-mainnet-op-reth-pruned-trace.yml
+++ b/op/reth/worldchain-mainnet-op-reth-pruned-trace.yml
@@ -24,12 +24,12 @@ x-logging-defaults: &logging-defaults
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/worldchain-mainnet-op-reth-pruned \
+# curl -X POST https://${IP}.traefik.me/worldchain-mainnet \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 
 services:
-  worldchain-mainnet-op-reth-pruned:
+  worldchain-mainnet:
     image: ${WORLDCHAIN_RETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-reth}:${WORLDCHAIN_MAINNET_RETH_VERSION:-v2.5.0}
     sysctls:
       # TCP Performance
@@ -104,16 +104,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.worldchain-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/worldchain-mainnet-op-reth-pruned
+      - traefik.http.middlewares.worldchain-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/worldchain-mainnet
       - traefik.http.services.worldchain-mainnet-op-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/worldchain-mainnet-op-reth-pruned`) || Path(`/worldchain-mainnet-op-reth-pruned/`))}
-      - ${NO_SSL:+traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace.rule=Path(`/worldchain-mainnet-op-reth-pruned`) || Path(`/worldchain-mainnet-op-reth-pruned/`)}
+      - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/worldchain-mainnet`) || Path(`/worldchain-mainnet/`))}
+      - ${NO_SSL:+traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace.rule=Path(`/worldchain-mainnet`) || Path(`/worldchain-mainnet/`)}
       - traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace.middlewares=worldchain-mainnet-op-reth-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  worldchain-mainnet-op-reth-pruned-node:
+  worldchain-mainnet-node:
     image: ${WORLDCHAIN_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${WORLDCHAIN_MAINNET_NODE_VERSION:-v1.19.2}
     ports:
       - 15216:15216
@@ -126,7 +126,7 @@ services:
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
       - OP_NODE_L2_ENGINE_KIND=reth
-      - OP_NODE_L2_ENGINE_RPC=http://worldchain-mainnet-op-reth-pruned:8551
+      - OP_NODE_L2_ENGINE_RPC=http://worldchain-mainnet:8551
       - OP_NODE_L2_ENGINE_RPC_TIMEOUT=120s
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
@@ -147,7 +147,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      worldchain-mainnet-op-reth-pruned:
+      worldchain-mainnet:
         condition: service_started
         restart: true
     networks:
@@ -160,12 +160,12 @@ services:
       - prometheus-scrape.port=7300
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.worldchain-mainnet-op-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/worldchain-mainnet-op-reth-pruned/node
+      - traefik.http.middlewares.worldchain-mainnet-op-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/worldchain-mainnet/node
       - traefik.http.services.worldchain-mainnet-op-reth-pruned-trace-node.loadbalancer.server.port=9545
       - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/worldchain-mainnet-op-reth-pruned/node`)}
-      - ${NO_SSL:+traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace-node.rule=PathPrefix(`/worldchain-mainnet-op-reth-pruned/node`)}
+      - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/worldchain-mainnet/node`)}
+      - ${NO_SSL:+traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace-node.rule=PathPrefix(`/worldchain-mainnet/node`)}
       - traefik.http.routers.worldchain-mainnet-op-reth-pruned-trace-node.middlewares=worldchain-mainnet-op-reth-pruned-trace-node-stripprefix, ipallowlist
 
 volumes:
diff --git a/tempo/reth/tempo-mainnet-reth-archive-trace.yml b/tempo/reth/tempo-mainnet-reth-archive-trace.yml
index 91154401..da8bd64b 100644
--- a/tempo/reth/tempo-mainnet-reth-archive-trace.yml
+++ b/tempo/reth/tempo-mainnet-reth-archive-trace.yml
@@ -78,6 +78,7 @@ services:
       - --discovery.port=13592
       - --engine.cross-block-cache-size=${TEMPO_MAINNET_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --follow=wss://rpc.tempo.xyz
       - --http
diff --git a/tempo/reth/tempo-mainnet-reth-pruned-trace.yml b/tempo/reth/tempo-mainnet-reth-pruned-trace.yml
index 6e6834b0..a95a737b 100644
--- a/tempo/reth/tempo-mainnet-reth-pruned-trace.yml
+++ b/tempo/reth/tempo-mainnet-reth-pruned-trace.yml
@@ -78,6 +78,7 @@ services:
       - --discovery.port=14843
       - --engine.cross-block-cache-size=${TEMPO_MAINNET_RETH_STATE_CACHE:-4096}
       - --engine.memory-block-buffer-target=0
+      - --engine.num-state-masking-blocks=0
       - --engine.persistence-threshold=0
       - --follow=wss://rpc.tempo.xyz
       - --full