diff --git a/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml b/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml
index b8a2b09c..3e632d0e 100644
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml
@@ -70,7 +70,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=19715
       - --caplin.discovery.tcpport=19715
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 8d20875c..2278c4a6 100644
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml
@@ -69,7 +69,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=17832
       - --caplin.discovery.tcpport=17832
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 445bc5dd..ce4c52f7 100644
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml
@@ -69,7 +69,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=16857
       - --caplin.discovery.tcpport=16857
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 4701941a..7a95e8e3 100644
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml
@@ -70,7 +70,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=16675
       - --caplin.discovery.tcpport=16675
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 3544859a..0dd3c4c5 100644
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml
@@ -69,7 +69,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=19614
       - --caplin.discovery.tcpport=19614
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 5abee4e1..2e75f8f1 100644
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml
@@ -69,7 +69,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=19616
       - --caplin.discovery.tcpport=19616
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 fa3eb414..b57a5ac2 100644
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml
@@ -70,7 +70,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=18317
       - --caplin.discovery.tcpport=18317
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 6d5efc34..e01bfcd2 100644
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml
@@ -69,7 +69,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=16087
       - --caplin.discovery.tcpport=16087
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 199b428b..3f2f1f34 100644
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml
@@ -69,7 +69,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=16930
       - --caplin.discovery.tcpport=16930
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 fd6ee707..ccb3b83f 100644
--- a/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml
@@ -68,7 +68,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=16986
       - --caplin.discovery.tcpport=16986
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 13039ed9..ab2de997 100644
--- a/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml
@@ -68,7 +68,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=16010
       - --caplin.discovery.tcpport=16010
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 a8f1f3bb..8d24699e 100644
--- a/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml
@@ -68,7 +68,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=16886
       - --caplin.discovery.tcpport=16886
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 dc2b200c..a3861049 100644
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml
@@ -68,7 +68,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=17974
       - --caplin.discovery.tcpport=17974
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 4f262b00..352383d6 100644
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml
@@ -68,7 +68,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=18429
       - --caplin.discovery.tcpport=18429
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 d8919912..06807ce7 100644
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml
@@ -68,7 +68,7 @@ services:
       - --caplin.discovery.addr=0.0.0.0
       - --caplin.discovery.port=17147
       - --caplin.discovery.tcpport=17147
-      - --caplin.nat=extip=
+      - --caplin.nat=extip:${IP}
       - --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 9a22f066..19a37200 100644
--- a/op/erigon/base-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/base-mainnet-op-erigon-archive-trace.yml
@@ -107,7 +107,7 @@ services:
     shm_size: 2gb
 
   base-mainnet-op-erigon-node:
-    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_MAINNET_NODE_VERSION:-v0.15.6}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node-reth}:${BASE_MAINNET_NODE_VERSION:-v0.16.1}
     ports:
       - 18092:18092
       - 18092:18092/udp
diff --git a/op/erigon/base-sepolia-op-erigon-archive-trace.yml b/op/erigon/base-sepolia-op-erigon-archive-trace.yml
index 6aa0dea1..a55cc731 100644
--- a/op/erigon/base-sepolia-op-erigon-archive-trace.yml
+++ b/op/erigon/base-sepolia-op-erigon-archive-trace.yml
@@ -106,7 +106,7 @@ services:
     shm_size: 2gb
 
   base-sepolia-op-erigon-node:
-    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_SEPOLIA_NODE_VERSION:-v0.15.6}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node-reth}:${BASE_SEPOLIA_NODE_VERSION:-v0.16.1}
     ports:
       - 18487:18487
       - 18487:18487/udp
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 aeade785..f9d01d78 100644
--- a/op/geth/base-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/base-mainnet-op-geth-archive-leveldb-hash.yml
@@ -107,7 +107,7 @@ 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:-ghcr.io/base/node}:${BASE_MAINNET_NODE_VERSION:-v0.15.6}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node-reth}:${BASE_MAINNET_NODE_VERSION:-v0.16.1}
     ports:
       - 18596:18596
       - 18596:18596/udp
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 c53d2024..49caa9a0 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,7 +171,7 @@ services:
       - traefik.http.routers.base-mainnet-op-geth-pruned-pebble-path-events.middlewares=ipallowlist
 
   base-mainnet-node:
-    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_MAINNET_NODE_VERSION:-v0.15.6}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node-reth}:${BASE_MAINNET_NODE_VERSION:-v0.16.1}
     ports:
       - 16422:16422
       - 16422:16422/udp
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 09b12405..e641f902 100644
--- a/op/geth/base-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/base-mainnet-op-geth-pruned-pebble-path.yml
@@ -107,7 +107,7 @@ 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:-ghcr.io/base/node}:${BASE_MAINNET_NODE_VERSION:-v0.15.6}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node-reth}:${BASE_MAINNET_NODE_VERSION:-v0.16.1}
     ports:
       - 16422:16422
       - 16422:16422/udp
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 8f1583ad..e12d0025 100644
--- a/op/geth/base-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/base-sepolia-op-geth-archive-leveldb-hash.yml
@@ -107,7 +107,7 @@ 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:-ghcr.io/base/node}:${BASE_SEPOLIA_NODE_VERSION:-v0.15.6}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node-reth}:${BASE_SEPOLIA_NODE_VERSION:-v0.16.1}
     ports:
       - 15910:15910
       - 15910:15910/udp
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 7e0827a2..eb37fab0 100644
--- a/op/geth/base-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/base-sepolia-op-geth-pruned-pebble-path.yml
@@ -107,7 +107,7 @@ 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:-ghcr.io/base/node}:${BASE_SEPOLIA_NODE_VERSION:-v0.15.6}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node-reth}:${BASE_SEPOLIA_NODE_VERSION:-v0.16.1}
     ports:
       - 17022:17022
       - 17022:17022/udp
diff --git a/op/reth/base-mainnet-op-reth-archive-trace.yml b/op/reth/base-mainnet-op-reth-archive-trace.yml
index e3ae8fcf..3b663833 100644
--- a/op/reth/base-mainnet-op-reth-archive-trace.yml
+++ b/op/reth/base-mainnet-op-reth-archive-trace.yml
@@ -107,7 +107,7 @@ services:
     shm_size: 2gb
 
   base-mainnet-op-reth-node:
-    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_MAINNET_NODE_VERSION:-v0.15.6}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node-reth}:${BASE_MAINNET_NODE_VERSION:-v0.16.1}
     ports:
       - 19221:19221
       - 19221:19221/udp
diff --git a/op/reth/base-mainnet-op-reth-minimal-trace.yml b/op/reth/base-mainnet-op-reth-minimal-trace.yml
index 42e7c111..e07e48b0 100644
--- a/op/reth/base-mainnet-op-reth-minimal-trace.yml
+++ b/op/reth/base-mainnet-op-reth-minimal-trace.yml
@@ -107,7 +107,7 @@ services:
     shm_size: 2gb
 
   base-mainnet-op-reth-minimal-node:
-    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_MAINNET_NODE_VERSION:-v0.15.6}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node-reth}:${BASE_MAINNET_NODE_VERSION:-v0.16.1}
     ports:
       - 16240:16240
       - 16240:16240/udp
diff --git a/op/reth/base-mainnet-op-reth-pruned-trace.yml b/op/reth/base-mainnet-op-reth-pruned-trace.yml
index ff5aede4..199084f5 100644
--- a/op/reth/base-mainnet-op-reth-pruned-trace.yml
+++ b/op/reth/base-mainnet-op-reth-pruned-trace.yml
@@ -108,7 +108,7 @@ services:
     shm_size: 2gb
 
   base-mainnet-op-reth-pruned-node:
-    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_MAINNET_NODE_VERSION:-v0.15.6}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node-reth}:${BASE_MAINNET_NODE_VERSION:-v0.16.1}
     ports:
       - 19759:19759
       - 19759:19759/udp
diff --git a/op/reth/base-sepolia-op-reth-archive-trace.yml b/op/reth/base-sepolia-op-reth-archive-trace.yml
index 5ff226f6..4291730c 100644
--- a/op/reth/base-sepolia-op-reth-archive-trace.yml
+++ b/op/reth/base-sepolia-op-reth-archive-trace.yml
@@ -107,7 +107,7 @@ services:
     shm_size: 2gb
 
   base-sepolia-op-reth-node:
-    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_SEPOLIA_NODE_VERSION:-v0.15.6}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node-reth}:${BASE_SEPOLIA_NODE_VERSION:-v0.16.1}
     ports:
       - 16390:16390
       - 16390:16390/udp
diff --git a/op/reth/base-sepolia-op-reth-minimal-trace.yml b/op/reth/base-sepolia-op-reth-minimal-trace.yml
index d83cc62c..260665e3 100644
--- a/op/reth/base-sepolia-op-reth-minimal-trace.yml
+++ b/op/reth/base-sepolia-op-reth-minimal-trace.yml
@@ -107,7 +107,7 @@ services:
     shm_size: 2gb
 
   base-sepolia-op-reth-minimal-node:
-    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_SEPOLIA_NODE_VERSION:-v0.15.6}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node-reth}:${BASE_SEPOLIA_NODE_VERSION:-v0.16.1}
     ports:
       - 17165:17165
       - 17165:17165/udp
diff --git a/op/reth/base-sepolia-op-reth-pruned-trace.yml b/op/reth/base-sepolia-op-reth-pruned-trace.yml
index 7e867264..75d94c53 100644
--- a/op/reth/base-sepolia-op-reth-pruned-trace.yml
+++ b/op/reth/base-sepolia-op-reth-pruned-trace.yml
@@ -108,7 +108,7 @@ services:
     shm_size: 2gb
 
   base-sepolia-op-reth-pruned-node:
-    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node}:${BASE_SEPOLIA_NODE_VERSION:-v0.15.6}
+    image: ${BASE_NODE_IMAGE:-ghcr.io/base/node-reth}:${BASE_SEPOLIA_NODE_VERSION:-v0.16.1}
     ports:
       - 16147:16147
       - 16147:16147/udp