diff --git a/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml b/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml
index 3e65d372..b8a2b09c 100644
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml
@@ -70,6 +70,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=19715
       - --caplin.discovery.tcpport=19715
+      - --caplin.nat=extip=
       - --chain=hoodi
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml b/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml
index 35b6114e..8d20875c 100644
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml
@@ -69,6 +69,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=17832
       - --caplin.discovery.tcpport=17832
+      - --caplin.nat=extip=
       - --chain=hoodi
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml b/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml
index 386fccf7..445bc5dd 100644
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml
@@ -69,6 +69,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=16857
       - --caplin.discovery.tcpport=16857
+      - --caplin.nat=extip=
       - --chain=hoodi
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml b/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml
index fb3958ad..4701941a 100644
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml
@@ -70,6 +70,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=16675
       - --caplin.discovery.tcpport=16675
+      - --caplin.nat=extip=
       - --chain=mainnet
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml b/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml
index 23e4c45a..3544859a 100644
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml
@@ -69,6 +69,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=19614
       - --caplin.discovery.tcpport=19614
+      - --caplin.nat=extip=
       - --chain=mainnet
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml b/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml
index 404d0404..5abee4e1 100644
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml
@@ -69,6 +69,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=19616
       - --caplin.discovery.tcpport=19616
+      - --caplin.nat=extip=
       - --chain=mainnet
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml b/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml
index e4ef77e5..fa3eb414 100644
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml
@@ -70,6 +70,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=18317
       - --caplin.discovery.tcpport=18317
+      - --caplin.nat=extip=
       - --chain=sepolia
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml b/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml
index 85397621..6d5efc34 100644
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml
@@ -69,6 +69,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=16087
       - --caplin.discovery.tcpport=16087
+      - --caplin.nat=extip=
       - --chain=sepolia
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml b/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml
index b2709bdd..199b428b 100644
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml
@@ -69,6 +69,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=16930
       - --caplin.discovery.tcpport=16930
+      - --caplin.nat=extip=
       - --chain=sepolia
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml b/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml
index 96d7dd79..fd6ee707 100644
--- a/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml
@@ -68,6 +68,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=16986
       - --caplin.discovery.tcpport=16986
+      - --caplin.nat=extip=
       - --chain=chiado
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml b/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml
index 6bcefe0a..13039ed9 100644
--- a/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml
@@ -68,6 +68,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=16010
       - --caplin.discovery.tcpport=16010
+      - --caplin.nat=extip=
       - --chain=chiado
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml b/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml
index 18f43666..a8f1f3bb 100644
--- a/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml
@@ -68,6 +68,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=16886
       - --caplin.discovery.tcpport=16886
+      - --caplin.nat=extip=
       - --chain=chiado
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml b/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml
index 4eda74cf..dc2b200c 100644
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml
@@ -68,6 +68,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=17974
       - --caplin.discovery.tcpport=17974
+      - --caplin.nat=extip=
       - --chain=gnosis
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml b/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml
index 0e800df6..4f262b00 100644
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml
@@ -68,6 +68,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=18429
       - --caplin.discovery.tcpport=18429
+      - --caplin.nat=extip=
       - --chain=gnosis
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml b/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml
index 70c2dbb6..d8919912 100644
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml
@@ -68,6 +68,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=17147
       - --caplin.discovery.tcpport=17147
+      - --caplin.nat=extip=
       - --chain=gnosis
       - --datadir=/root/.local/share/erigon
       - --http
diff --git a/op/erigon/base-mainnet-op-erigon-archive-trace.yml b/op/erigon/base-mainnet-op-erigon-archive-trace.yml
index a9b83d8b..7e37d138 100644
--- a/op/erigon/base-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/base-mainnet-op-erigon-archive-trace.yml
@@ -107,36 +107,40 @@ services:
     shm_size: 2gb
 
   base-mainnet-op-erigon-node:
-    image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_MAINNET_NODE_VERSION:-v1.16.3}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_MAINNET_NODE_VERSION:-v0.15.6}
     ports:
       - 18092:18092
       - 18092:18092/udp
     environment:
-      - OP_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
-      - OP_NODE_L1_BEACON_ARCHIVER=${ETHEREUM_MAINNET_BEACON_ARCHIVER}
-      - OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
+      - BASE_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
+      - BASE_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}
+      - BASE_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
+      - BASE_NODE_L2_ENGINE_AUTH=/jwtsecret
+      - BASE_NODE_L2_ENGINE_RPC=http://base-mainnet-op-erigon:8551
+      - BASE_NODE_METRICS_ADDR=0.0.0.0
+      - BASE_NODE_METRICS_ENABLED=true
+      - BASE_NODE_METRICS_PORT=7300
+      - BASE_NODE_NETWORK=base
+      - BASE_NODE_P2P_ADVERTISE_IP=${IP}
+      - BASE_NODE_P2P_ADVERTISE_TCP_PORT=18092
+      - BASE_NODE_P2P_ADVERTISE_UDP_PORT=18092
+      - BASE_NODE_P2P_LISTEN_IP=0.0.0.0
+      - BASE_NODE_P2P_LISTEN_TCP_PORT=18092
+      - BASE_NODE_P2P_LISTEN_UDP_PORT=18092
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_KIND=erigon
-      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=base-mainnet
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=18092
-      - OP_NODE_P2P_LISTEN_UDP_PORT=18092
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
+    entrypoint: [base-consensus, node]
     restart: unless-stopped
     depends_on:
       - base-mainnet-op-erigon
diff --git a/op/erigon/base-sepolia-op-erigon-archive-trace.yml b/op/erigon/base-sepolia-op-erigon-archive-trace.yml
index 449bf96b..d50dfd6b 100644
--- a/op/erigon/base-sepolia-op-erigon-archive-trace.yml
+++ b/op/erigon/base-sepolia-op-erigon-archive-trace.yml
@@ -106,37 +106,40 @@ services:
     shm_size: 2gb
 
   base-sepolia-op-erigon-node:
-    image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_SEPOLIA_NODE_VERSION:-v1.16.3}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_SEPOLIA_NODE_VERSION:-v0.15.6}
     ports:
       - 18487:18487
       - 18487:18487/udp
     environment:
-      - 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}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
+      - BASE_NODE_L1_BEACON=${ETHEREUM_SEPOLIA_BEACON_REST}
+      - BASE_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}
+      - BASE_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
+      - BASE_NODE_L2_ENGINE_AUTH=/jwtsecret
+      - BASE_NODE_L2_ENGINE_RPC=http://base-sepolia-op-erigon:8551
+      - BASE_NODE_METRICS_ADDR=0.0.0.0
+      - BASE_NODE_METRICS_ENABLED=true
+      - BASE_NODE_METRICS_PORT=7300
+      - BASE_NODE_NETWORK=base-sepolia
+      - BASE_NODE_P2P_ADVERTISE_IP=${IP}
+      - BASE_NODE_P2P_ADVERTISE_TCP_PORT=18487
+      - BASE_NODE_P2P_ADVERTISE_UDP_PORT=18487
+      - BASE_NODE_P2P_LISTEN_IP=0.0.0.0
+      - BASE_NODE_P2P_LISTEN_TCP_PORT=18487
+      - BASE_NODE_P2P_LISTEN_UDP_PORT=18487
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_KIND=erigon
-      - OP_NODE_L2_ENGINE_RPC=http://base-sepolia-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=base-sepolia
-      - OP_NODE_OVERRIDE_PECTRABLOBSCHEDULE=1742486400
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=18487
-      - OP_NODE_P2P_LISTEN_UDP_PORT=18487
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
+    entrypoint: [base-consensus, node]
     restart: unless-stopped
     depends_on:
       - base-sepolia-op-erigon
diff --git a/op/geth/base-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/base-mainnet-op-geth-archive-leveldb-hash.yml
index a30d7acc..188da4ae 100644
--- a/op/geth/base-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/base-mainnet-op-geth-archive-leveldb-hash.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   base-mainnet-archive:
-    image: ${BASE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${BASE_MAINNET_GETH_VERSION:-v1.101603.5}
+    image: ${BASE_GETH_IMAGE:-ghcr.io/base/node-geth}:${BASE_MAINNET_GETH_VERSION:-v0.15.6}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -107,35 +107,40 @@ services:
       - traefik.http.routers.base-mainnet-op-geth-archive-leveldb-hash.middlewares=base-mainnet-op-geth-archive-leveldb-hash-stripprefix, ipallowlist
 
   base-mainnet-archive-node:
-    image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_MAINNET_NODE_VERSION:-v1.16.3}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_MAINNET_NODE_VERSION:-v0.15.6}
     ports:
       - 18596:18596
       - 18596:18596/udp
     environment:
-      - OP_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
-      - OP_NODE_L1_BEACON_ARCHIVER=${ETHEREUM_MAINNET_BEACON_ARCHIVER}
-      - OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
+      - BASE_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
+      - BASE_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}
+      - BASE_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
+      - BASE_NODE_L2_ENGINE_AUTH=/jwtsecret
+      - BASE_NODE_L2_ENGINE_RPC=http://base-mainnet-archive:8551
+      - BASE_NODE_METRICS_ADDR=0.0.0.0
+      - BASE_NODE_METRICS_ENABLED=true
+      - BASE_NODE_METRICS_PORT=7300
+      - BASE_NODE_NETWORK=base
+      - BASE_NODE_P2P_ADVERTISE_IP=${IP}
+      - BASE_NODE_P2P_ADVERTISE_TCP_PORT=18596
+      - BASE_NODE_P2P_ADVERTISE_UDP_PORT=18596
+      - BASE_NODE_P2P_LISTEN_IP=0.0.0.0
+      - BASE_NODE_P2P_LISTEN_TCP_PORT=18596
+      - BASE_NODE_P2P_LISTEN_UDP_PORT=18596
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-archive:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=base-mainnet
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=18596
-      - OP_NODE_P2P_LISTEN_UDP_PORT=18596
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
+    entrypoint: [base-consensus, node]
     restart: unless-stopped
     depends_on:
       - base-mainnet-archive
diff --git a/op/geth/base-mainnet-op-geth-pruned-pebble-path--fireeth.yml b/op/geth/base-mainnet-op-geth-pruned-pebble-path--fireeth.yml
index 355faec6..2875418b 100644
--- a/op/geth/base-mainnet-op-geth-pruned-pebble-path--fireeth.yml
+++ b/op/geth/base-mainnet-op-geth-pruned-pebble-path--fireeth.yml
@@ -171,35 +171,40 @@ services:
       - traefik.http.routers.base-mainnet-op-geth-pruned-pebble-path-events.middlewares=ipallowlist
 
   base-mainnet-node:
-    image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_MAINNET_NODE_VERSION:-v1.16.3}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_MAINNET_NODE_VERSION:-v0.15.6}
     ports:
       - 16422:16422
       - 16422:16422/udp
     environment:
-      - OP_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
-      - OP_NODE_L1_BEACON_ARCHIVER=${ETHEREUM_MAINNET_BEACON_ARCHIVER}
-      - OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
+      - BASE_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
+      - BASE_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}
+      - BASE_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
+      - BASE_NODE_L2_ENGINE_AUTH=/jwtsecret
+      - BASE_NODE_L2_ENGINE_RPC=http://base-mainnet:8551
+      - BASE_NODE_METRICS_ADDR=0.0.0.0
+      - BASE_NODE_METRICS_ENABLED=true
+      - BASE_NODE_METRICS_PORT=7300
+      - BASE_NODE_NETWORK=base
+      - BASE_NODE_P2P_ADVERTISE_IP=${IP}
+      - BASE_NODE_P2P_ADVERTISE_TCP_PORT=16422
+      - BASE_NODE_P2P_ADVERTISE_UDP_PORT=16422
+      - BASE_NODE_P2P_LISTEN_IP=0.0.0.0
+      - BASE_NODE_P2P_LISTEN_TCP_PORT=16422
+      - BASE_NODE_P2P_LISTEN_UDP_PORT=16422
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=base-mainnet
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=16422
-      - OP_NODE_P2P_LISTEN_UDP_PORT=16422
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
+    entrypoint: [base-consensus, node]
     restart: unless-stopped
     depends_on:
       - base-mainnet
diff --git a/op/geth/base-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/base-mainnet-op-geth-pruned-pebble-path.yml
index ef56cee5..7525332f 100644
--- a/op/geth/base-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/base-mainnet-op-geth-pruned-pebble-path.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   base-mainnet:
-    image: ${BASE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${BASE_MAINNET_GETH_VERSION:-v1.101603.5}
+    image: ${BASE_GETH_IMAGE:-ghcr.io/base/node-geth}:${BASE_MAINNET_GETH_VERSION:-v0.15.6}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -107,35 +107,40 @@ services:
       - traefik.http.routers.base-mainnet-op-geth-pruned-pebble-path.middlewares=base-mainnet-op-geth-pruned-pebble-path-stripprefix, ipallowlist
 
   base-mainnet-node:
-    image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_MAINNET_NODE_VERSION:-v1.16.3}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_MAINNET_NODE_VERSION:-v0.15.6}
     ports:
       - 16422:16422
       - 16422:16422/udp
     environment:
-      - OP_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
-      - OP_NODE_L1_BEACON_ARCHIVER=${ETHEREUM_MAINNET_BEACON_ARCHIVER}
-      - OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
+      - BASE_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
+      - BASE_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}
+      - BASE_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
+      - BASE_NODE_L2_ENGINE_AUTH=/jwtsecret
+      - BASE_NODE_L2_ENGINE_RPC=http://base-mainnet:8551
+      - BASE_NODE_METRICS_ADDR=0.0.0.0
+      - BASE_NODE_METRICS_ENABLED=true
+      - BASE_NODE_METRICS_PORT=7300
+      - BASE_NODE_NETWORK=base
+      - BASE_NODE_P2P_ADVERTISE_IP=${IP}
+      - BASE_NODE_P2P_ADVERTISE_TCP_PORT=16422
+      - BASE_NODE_P2P_ADVERTISE_UDP_PORT=16422
+      - BASE_NODE_P2P_LISTEN_IP=0.0.0.0
+      - BASE_NODE_P2P_LISTEN_TCP_PORT=16422
+      - BASE_NODE_P2P_LISTEN_UDP_PORT=16422
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=base-mainnet
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=16422
-      - OP_NODE_P2P_LISTEN_UDP_PORT=16422
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
+    entrypoint: [base-consensus, node]
     restart: unless-stopped
     depends_on:
       - base-mainnet
diff --git a/op/geth/base-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/base-sepolia-op-geth-archive-leveldb-hash.yml
index 33435189..2b38c85c 100644
--- a/op/geth/base-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/base-sepolia-op-geth-archive-leveldb-hash.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   base-sepolia-archive:
-    image: ${BASE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${BASE_SEPOLIA_GETH_VERSION:-v1.101603.5}
+    image: ${BASE_GETH_IMAGE:-ghcr.io/base/node-geth}:${BASE_SEPOLIA_GETH_VERSION:-v0.15.6}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -107,36 +107,40 @@ services:
       - traefik.http.routers.base-sepolia-op-geth-archive-leveldb-hash.middlewares=base-sepolia-op-geth-archive-leveldb-hash-stripprefix, ipallowlist
 
   base-sepolia-archive-node:
-    image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_SEPOLIA_NODE_VERSION:-v1.16.3}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_SEPOLIA_NODE_VERSION:-v0.15.6}
     ports:
       - 15910:15910
       - 15910:15910/udp
     environment:
-      - 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}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
+      - BASE_NODE_L1_BEACON=${ETHEREUM_SEPOLIA_BEACON_REST}
+      - BASE_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}
+      - BASE_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
+      - BASE_NODE_L2_ENGINE_AUTH=/jwtsecret
+      - BASE_NODE_L2_ENGINE_RPC=http://base-sepolia-archive:8551
+      - BASE_NODE_METRICS_ADDR=0.0.0.0
+      - BASE_NODE_METRICS_ENABLED=true
+      - BASE_NODE_METRICS_PORT=7300
+      - BASE_NODE_NETWORK=base-sepolia
+      - BASE_NODE_P2P_ADVERTISE_IP=${IP}
+      - BASE_NODE_P2P_ADVERTISE_TCP_PORT=15910
+      - BASE_NODE_P2P_ADVERTISE_UDP_PORT=15910
+      - BASE_NODE_P2P_LISTEN_IP=0.0.0.0
+      - BASE_NODE_P2P_LISTEN_TCP_PORT=15910
+      - BASE_NODE_P2P_LISTEN_UDP_PORT=15910
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-sepolia-archive:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=base-sepolia
-      - OP_NODE_OVERRIDE_PECTRABLOBSCHEDULE=1742486400
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=15910
-      - OP_NODE_P2P_LISTEN_UDP_PORT=15910
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
+    entrypoint: [base-consensus, node]
     restart: unless-stopped
     depends_on:
       - base-sepolia-archive
diff --git a/op/geth/base-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/base-sepolia-op-geth-pruned-pebble-path.yml
index 8093c924..fb52782d 100644
--- a/op/geth/base-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/base-sepolia-op-geth-pruned-pebble-path.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   base-sepolia:
-    image: ${BASE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${BASE_SEPOLIA_GETH_VERSION:-v1.101603.5}
+    image: ${BASE_GETH_IMAGE:-ghcr.io/base/node-geth}:${BASE_SEPOLIA_GETH_VERSION:-v0.15.6}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -107,36 +107,40 @@ services:
       - traefik.http.routers.base-sepolia-op-geth-pruned-pebble-path.middlewares=base-sepolia-op-geth-pruned-pebble-path-stripprefix, ipallowlist
 
   base-sepolia-node:
-    image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_SEPOLIA_NODE_VERSION:-v1.16.3}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_SEPOLIA_NODE_VERSION:-v0.15.6}
     ports:
       - 17022:17022
       - 17022:17022/udp
     environment:
-      - 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}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
+      - BASE_NODE_L1_BEACON=${ETHEREUM_SEPOLIA_BEACON_REST}
+      - BASE_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}
+      - BASE_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
+      - BASE_NODE_L2_ENGINE_AUTH=/jwtsecret
+      - BASE_NODE_L2_ENGINE_RPC=http://base-sepolia:8551
+      - BASE_NODE_METRICS_ADDR=0.0.0.0
+      - BASE_NODE_METRICS_ENABLED=true
+      - BASE_NODE_METRICS_PORT=7300
+      - BASE_NODE_NETWORK=base-sepolia
+      - BASE_NODE_P2P_ADVERTISE_IP=${IP}
+      - BASE_NODE_P2P_ADVERTISE_TCP_PORT=17022
+      - BASE_NODE_P2P_ADVERTISE_UDP_PORT=17022
+      - BASE_NODE_P2P_LISTEN_IP=0.0.0.0
+      - BASE_NODE_P2P_LISTEN_TCP_PORT=17022
+      - BASE_NODE_P2P_LISTEN_UDP_PORT=17022
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-sepolia:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=base-sepolia
-      - OP_NODE_OVERRIDE_PECTRABLOBSCHEDULE=1742486400
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=17022
-      - OP_NODE_P2P_LISTEN_UDP_PORT=17022
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
+    entrypoint: [base-consensus, node]
     restart: unless-stopped
     depends_on:
       - base-sepolia
diff --git a/op/reth/base-mainnet-op-reth-archive-trace.yml b/op/reth/base-mainnet-op-reth-archive-trace.yml
index 22ef3225..eb15414a 100644
--- a/op/reth/base-mainnet-op-reth-archive-trace.yml
+++ b/op/reth/base-mainnet-op-reth-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   base-mainnet-op-reth:
-    image: ${BASE_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${BASE_MAINNET_RETH_VERSION:-v1.10.2}
+    image: ${BASE_RETH_IMAGE:-ghcr.io/base/node-reth}:${BASE_MAINNET_RETH_VERSION:-v0.16.1}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -107,36 +107,40 @@ services:
     shm_size: 2gb
 
   base-mainnet-op-reth-node:
-    image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_MAINNET_NODE_VERSION:-v1.16.3}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_MAINNET_NODE_VERSION:-v0.15.6}
     ports:
       - 19221:19221
       - 19221:19221/udp
     environment:
-      - OP_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
-      - OP_NODE_L1_BEACON_ARCHIVER=${ETHEREUM_MAINNET_BEACON_ARCHIVER}
-      - OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
+      - BASE_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
+      - BASE_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}
+      - BASE_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
+      - BASE_NODE_L2_ENGINE_AUTH=/jwtsecret
+      - BASE_NODE_L2_ENGINE_RPC=http://base-mainnet-op-reth:8551
+      - BASE_NODE_METRICS_ADDR=0.0.0.0
+      - BASE_NODE_METRICS_ENABLED=true
+      - BASE_NODE_METRICS_PORT=7300
+      - BASE_NODE_NETWORK=base
+      - BASE_NODE_P2P_ADVERTISE_IP=${IP}
+      - BASE_NODE_P2P_ADVERTISE_TCP_PORT=19221
+      - BASE_NODE_P2P_ADVERTISE_UDP_PORT=19221
+      - BASE_NODE_P2P_LISTEN_IP=0.0.0.0
+      - BASE_NODE_P2P_LISTEN_TCP_PORT=19221
+      - BASE_NODE_P2P_LISTEN_UDP_PORT=19221
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_KIND=reth
-      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-op-reth:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=base-mainnet
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=19221
-      - OP_NODE_P2P_LISTEN_UDP_PORT=19221
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
+    entrypoint: [base-consensus, node]
     restart: unless-stopped
     depends_on:
       - base-mainnet-op-reth
diff --git a/op/reth/base-mainnet-op-reth-minimal-trace.yml b/op/reth/base-mainnet-op-reth-minimal-trace.yml
index f3380cbb..1886f92b 100644
--- a/op/reth/base-mainnet-op-reth-minimal-trace.yml
+++ b/op/reth/base-mainnet-op-reth-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   base-mainnet-op-reth-minimal:
-    image: ${BASE_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${BASE_MAINNET_RETH_VERSION:-v1.10.2}
+    image: ${BASE_RETH_IMAGE:-ghcr.io/base/node-reth}:${BASE_MAINNET_RETH_VERSION:-v0.16.1}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -107,36 +107,40 @@ services:
     shm_size: 2gb
 
   base-mainnet-op-reth-minimal-node:
-    image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_MAINNET_NODE_VERSION:-v1.16.3}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_MAINNET_NODE_VERSION:-v0.15.6}
     ports:
       - 16240:16240
       - 16240:16240/udp
     environment:
-      - OP_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
-      - OP_NODE_L1_BEACON_ARCHIVER=${ETHEREUM_MAINNET_BEACON_ARCHIVER}
-      - OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
+      - BASE_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
+      - BASE_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}
+      - BASE_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
+      - BASE_NODE_L2_ENGINE_AUTH=/jwtsecret
+      - BASE_NODE_L2_ENGINE_RPC=http://base-mainnet-op-reth-minimal:8551
+      - BASE_NODE_METRICS_ADDR=0.0.0.0
+      - BASE_NODE_METRICS_ENABLED=true
+      - BASE_NODE_METRICS_PORT=7300
+      - BASE_NODE_NETWORK=base
+      - BASE_NODE_P2P_ADVERTISE_IP=${IP}
+      - BASE_NODE_P2P_ADVERTISE_TCP_PORT=16240
+      - BASE_NODE_P2P_ADVERTISE_UDP_PORT=16240
+      - BASE_NODE_P2P_LISTEN_IP=0.0.0.0
+      - BASE_NODE_P2P_LISTEN_TCP_PORT=16240
+      - BASE_NODE_P2P_LISTEN_UDP_PORT=16240
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_KIND=reth
-      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-op-reth-minimal:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=base-mainnet
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=16240
-      - OP_NODE_P2P_LISTEN_UDP_PORT=16240
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
+    entrypoint: [base-consensus, node]
     restart: unless-stopped
     depends_on:
       - base-mainnet-op-reth-minimal
diff --git a/op/reth/base-mainnet-op-reth-pruned-trace.yml b/op/reth/base-mainnet-op-reth-pruned-trace.yml
index 1454c198..52d7638b 100644
--- a/op/reth/base-mainnet-op-reth-pruned-trace.yml
+++ b/op/reth/base-mainnet-op-reth-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   base-mainnet-op-reth-pruned:
-    image: ${BASE_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${BASE_MAINNET_RETH_VERSION:-v1.10.2}
+    image: ${BASE_RETH_IMAGE:-ghcr.io/base/node-reth}:${BASE_MAINNET_RETH_VERSION:-v0.16.1}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -108,36 +108,40 @@ services:
     shm_size: 2gb
 
   base-mainnet-op-reth-pruned-node:
-    image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_MAINNET_NODE_VERSION:-v1.16.3}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_MAINNET_NODE_VERSION:-v0.15.6}
     ports:
       - 19759:19759
       - 19759:19759/udp
     environment:
-      - OP_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
-      - OP_NODE_L1_BEACON_ARCHIVER=${ETHEREUM_MAINNET_BEACON_ARCHIVER}
-      - OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
+      - BASE_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
+      - BASE_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}
+      - BASE_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
+      - BASE_NODE_L2_ENGINE_AUTH=/jwtsecret
+      - BASE_NODE_L2_ENGINE_RPC=http://base-mainnet-op-reth-pruned:8551
+      - BASE_NODE_METRICS_ADDR=0.0.0.0
+      - BASE_NODE_METRICS_ENABLED=true
+      - BASE_NODE_METRICS_PORT=7300
+      - BASE_NODE_NETWORK=base
+      - BASE_NODE_P2P_ADVERTISE_IP=${IP}
+      - BASE_NODE_P2P_ADVERTISE_TCP_PORT=19759
+      - BASE_NODE_P2P_ADVERTISE_UDP_PORT=19759
+      - BASE_NODE_P2P_LISTEN_IP=0.0.0.0
+      - BASE_NODE_P2P_LISTEN_TCP_PORT=19759
+      - BASE_NODE_P2P_LISTEN_UDP_PORT=19759
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_KIND=reth
-      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-op-reth-pruned:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=base-mainnet
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=19759
-      - OP_NODE_P2P_LISTEN_UDP_PORT=19759
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
+    entrypoint: [base-consensus, node]
     restart: unless-stopped
     depends_on:
       - base-mainnet-op-reth-pruned
diff --git a/op/reth/base-sepolia-op-reth-archive-trace.yml b/op/reth/base-sepolia-op-reth-archive-trace.yml
index 2a2a44c1..7f96d21c 100644
--- a/op/reth/base-sepolia-op-reth-archive-trace.yml
+++ b/op/reth/base-sepolia-op-reth-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   base-sepolia-op-reth:
-    image: ${BASE_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${BASE_SEPOLIA_RETH_VERSION:-v1.10.2}
+    image: ${BASE_RETH_IMAGE:-ghcr.io/base/node-reth}:${BASE_SEPOLIA_RETH_VERSION:-v0.16.1}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -107,37 +107,40 @@ services:
     shm_size: 2gb
 
   base-sepolia-op-reth-node:
-    image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_SEPOLIA_NODE_VERSION:-v1.16.3}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_SEPOLIA_NODE_VERSION:-v0.15.6}
     ports:
       - 16390:16390
       - 16390:16390/udp
     environment:
-      - 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}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
+      - BASE_NODE_L1_BEACON=${ETHEREUM_SEPOLIA_BEACON_REST}
+      - BASE_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}
+      - BASE_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
+      - BASE_NODE_L2_ENGINE_AUTH=/jwtsecret
+      - BASE_NODE_L2_ENGINE_RPC=http://base-sepolia-op-reth:8551
+      - BASE_NODE_METRICS_ADDR=0.0.0.0
+      - BASE_NODE_METRICS_ENABLED=true
+      - BASE_NODE_METRICS_PORT=7300
+      - BASE_NODE_NETWORK=base-sepolia
+      - BASE_NODE_P2P_ADVERTISE_IP=${IP}
+      - BASE_NODE_P2P_ADVERTISE_TCP_PORT=16390
+      - BASE_NODE_P2P_ADVERTISE_UDP_PORT=16390
+      - BASE_NODE_P2P_LISTEN_IP=0.0.0.0
+      - BASE_NODE_P2P_LISTEN_TCP_PORT=16390
+      - BASE_NODE_P2P_LISTEN_UDP_PORT=16390
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_KIND=reth
-      - OP_NODE_L2_ENGINE_RPC=http://base-sepolia-op-reth:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=base-sepolia
-      - OP_NODE_OVERRIDE_PECTRABLOBSCHEDULE=1742486400
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=16390
-      - OP_NODE_P2P_LISTEN_UDP_PORT=16390
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
+    entrypoint: [base-consensus, node]
     restart: unless-stopped
     depends_on:
       - base-sepolia-op-reth
diff --git a/op/reth/base-sepolia-op-reth-minimal-trace.yml b/op/reth/base-sepolia-op-reth-minimal-trace.yml
index 74b42980..875f3ecd 100644
--- a/op/reth/base-sepolia-op-reth-minimal-trace.yml
+++ b/op/reth/base-sepolia-op-reth-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   base-sepolia-op-reth-minimal:
-    image: ${BASE_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${BASE_SEPOLIA_RETH_VERSION:-v1.10.2}
+    image: ${BASE_RETH_IMAGE:-ghcr.io/base/node-reth}:${BASE_SEPOLIA_RETH_VERSION:-v0.16.1}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -107,37 +107,40 @@ services:
     shm_size: 2gb
 
   base-sepolia-op-reth-minimal-node:
-    image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_SEPOLIA_NODE_VERSION:-v1.16.3}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_SEPOLIA_NODE_VERSION:-v0.15.6}
     ports:
       - 17165:17165
       - 17165:17165/udp
     environment:
-      - 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}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
+      - BASE_NODE_L1_BEACON=${ETHEREUM_SEPOLIA_BEACON_REST}
+      - BASE_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}
+      - BASE_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
+      - BASE_NODE_L2_ENGINE_AUTH=/jwtsecret
+      - BASE_NODE_L2_ENGINE_RPC=http://base-sepolia-op-reth-minimal:8551
+      - BASE_NODE_METRICS_ADDR=0.0.0.0
+      - BASE_NODE_METRICS_ENABLED=true
+      - BASE_NODE_METRICS_PORT=7300
+      - BASE_NODE_NETWORK=base-sepolia
+      - BASE_NODE_P2P_ADVERTISE_IP=${IP}
+      - BASE_NODE_P2P_ADVERTISE_TCP_PORT=17165
+      - BASE_NODE_P2P_ADVERTISE_UDP_PORT=17165
+      - BASE_NODE_P2P_LISTEN_IP=0.0.0.0
+      - BASE_NODE_P2P_LISTEN_TCP_PORT=17165
+      - BASE_NODE_P2P_LISTEN_UDP_PORT=17165
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_KIND=reth
-      - OP_NODE_L2_ENGINE_RPC=http://base-sepolia-op-reth-minimal:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=base-sepolia
-      - OP_NODE_OVERRIDE_PECTRABLOBSCHEDULE=1742486400
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=17165
-      - OP_NODE_P2P_LISTEN_UDP_PORT=17165
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
+    entrypoint: [base-consensus, node]
     restart: unless-stopped
     depends_on:
       - base-sepolia-op-reth-minimal
diff --git a/op/reth/base-sepolia-op-reth-pruned-trace.yml b/op/reth/base-sepolia-op-reth-pruned-trace.yml
index a761f424..1ec99ed6 100644
--- a/op/reth/base-sepolia-op-reth-pruned-trace.yml
+++ b/op/reth/base-sepolia-op-reth-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   base-sepolia-op-reth-pruned:
-    image: ${BASE_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${BASE_SEPOLIA_RETH_VERSION:-v1.10.2}
+    image: ${BASE_RETH_IMAGE:-ghcr.io/base/node-reth}:${BASE_SEPOLIA_RETH_VERSION:-v0.16.1}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -108,37 +108,40 @@ services:
     shm_size: 2gb
 
   base-sepolia-op-reth-pruned-node:
-    image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_SEPOLIA_NODE_VERSION:-v1.16.3}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_SEPOLIA_NODE_VERSION:-v0.15.6}
     ports:
       - 16147:16147
       - 16147:16147/udp
     environment:
-      - 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}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
+      - BASE_NODE_L1_BEACON=${ETHEREUM_SEPOLIA_BEACON_REST}
+      - BASE_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}
+      - BASE_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
+      - BASE_NODE_L2_ENGINE_AUTH=/jwtsecret
+      - BASE_NODE_L2_ENGINE_RPC=http://base-sepolia-op-reth-pruned:8551
+      - BASE_NODE_METRICS_ADDR=0.0.0.0
+      - BASE_NODE_METRICS_ENABLED=true
+      - BASE_NODE_METRICS_PORT=7300
+      - BASE_NODE_NETWORK=base-sepolia
+      - BASE_NODE_P2P_ADVERTISE_IP=${IP}
+      - BASE_NODE_P2P_ADVERTISE_TCP_PORT=16147
+      - BASE_NODE_P2P_ADVERTISE_UDP_PORT=16147
+      - BASE_NODE_P2P_LISTEN_IP=0.0.0.0
+      - BASE_NODE_P2P_LISTEN_TCP_PORT=16147
+      - BASE_NODE_P2P_LISTEN_UDP_PORT=16147
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_KIND=reth
-      - OP_NODE_L2_ENGINE_RPC=http://base-sepolia-op-reth-pruned:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=base-sepolia
-      - OP_NODE_OVERRIDE_PECTRABLOBSCHEDULE=1742486400
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=16147
-      - OP_NODE_P2P_LISTEN_UDP_PORT=16147
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
+    entrypoint: [base-consensus, node]
     restart: unless-stopped
     depends_on:
       - base-sepolia-op-reth-pruned