diff --git a/op/erigon/boba-mainnet-op-erigon-archive-trace.yml b/op/erigon/boba-mainnet-op-erigon-archive-trace.yml
index d9612a85..a8a93ad6 100644
--- a/op/erigon/boba-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/boba-mainnet-op-erigon-archive-trace.yml
@@ -2,7 +2,7 @@
 
 services:
   boba-mainnet-archive:
-    image: ${BOBA_ERIGON_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/erigon}:${BOBA_MAINNET_ERIGON_VERSION:-v1.2.11}
+    image: ${BOBA_ERIGON_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/op-erigon}:${BOBA_MAINNET_ERIGON_VERSION:-v1.2.11}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
@@ -77,7 +77,7 @@ services:
       - traefik.http.routers.boba-mainnet-op-erigon-archive-trace.middlewares=boba-mainnet-op-erigon-archive-trace-stripprefix, ipwhitelist
 
   boba-mainnet-archive-node:
-    image: ${BOBA_NODE_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/node}:${BOBA_MAINNET_NODE_VERSION:-v1.6.18}
+    image: ${BOBA_NODE_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/op-node}:${BOBA_MAINNET_NODE_VERSION:-v1.6.18}
     ports:
       - 15732:15732
       - 15732:15732/udp
diff --git a/op/erigon/boba-sepolia-op-erigon-archive-trace.yml b/op/erigon/boba-sepolia-op-erigon-archive-trace.yml
index be116a83..86dd91a4 100644
--- a/op/erigon/boba-sepolia-op-erigon-archive-trace.yml
+++ b/op/erigon/boba-sepolia-op-erigon-archive-trace.yml
@@ -2,7 +2,7 @@
 
 services:
   boba-sepolia-archive:
-    image: ${BOBA_ERIGON_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/erigon}:${BOBA_SEPOLIA_ERIGON_VERSION:-v1.2.11}
+    image: ${BOBA_ERIGON_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/op-erigon}:${BOBA_SEPOLIA_ERIGON_VERSION:-v1.2.11}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
@@ -77,7 +77,7 @@ services:
       - traefik.http.routers.boba-sepolia-op-erigon-archive-trace.middlewares=boba-sepolia-op-erigon-archive-trace-stripprefix, ipwhitelist
 
   boba-sepolia-archive-node:
-    image: ${BOBA_NODE_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/node}:${BOBA_SEPOLIA_NODE_VERSION:-v1.6.18}
+    image: ${BOBA_NODE_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/op-node}:${BOBA_SEPOLIA_NODE_VERSION:-v1.6.18}
     ports:
       - 15249:15249
       - 15249:15249/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 2ecfc981..eb755d1f 100644
--- a/op/geth/base-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/base-mainnet-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   base-mainnet-archive:
-    image: ${BASE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${BASE_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${BASE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${BASE_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
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 84ab0607..b5a2a50f 100644
--- a/op/geth/base-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/base-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   base-mainnet:
-    image: ${BASE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${BASE_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${BASE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${BASE_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
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 df3e0ed0..9837a2dc 100644
--- a/op/geth/base-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/base-sepolia-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   base-sepolia-archive:
-    image: ${BASE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${BASE_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${BASE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${BASE_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
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 735e2b9e..1b34dde3 100644
--- a/op/geth/base-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/base-sepolia-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   base-sepolia:
-    image: ${BASE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${BASE_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${BASE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${BASE_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/bob-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/bob-mainnet-op-geth-archive-leveldb-hash.yml
index 08c97edd..5cbe050a 100644
--- a/op/geth/bob-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/bob-mainnet-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   bob-mainnet-archive:
-    image: ${BOB_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${BOB_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${BOB_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${BOB_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/bob-mainnet-op-geth-pruned-pebble-hash.yml b/op/geth/bob-mainnet-op-geth-pruned-pebble-hash.yml
index 1ea8edaa..f716c3a6 100644
--- a/op/geth/bob-mainnet-op-geth-pruned-pebble-hash.yml
+++ b/op/geth/bob-mainnet-op-geth-pruned-pebble-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   bob-mainnet:
-    image: ${BOB_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${BOB_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${BOB_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${BOB_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/boba-mainnet-op-geth-pruned.yml b/op/geth/boba-mainnet-op-geth-pruned.yml
index cbd07611..664ce94d 100644
--- a/op/geth/boba-mainnet-op-geth-pruned.yml
+++ b/op/geth/boba-mainnet-op-geth-pruned.yml
@@ -2,7 +2,7 @@
 
 services:
   boba-mainnet:
-    image: ${BOBA_GETH_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/geth}:${BOBA_MAINNET_GETH_VERSION:-v1.101503.1}
+    image: ${BOBA_GETH_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/op-geth}:${BOBA_MAINNET_GETH_VERSION:-v1.101503.1}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
@@ -77,7 +77,7 @@ services:
       - traefik.http.routers.boba-mainnet-op-geth-pruned.middlewares=boba-mainnet-op-geth-pruned-stripprefix, ipwhitelist
 
   boba-mainnet-node:
-    image: ${BOBA_NODE_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/node}:${BOBA_MAINNET_NODE_VERSION:-v1.6.18}
+    image: ${BOBA_NODE_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/op-node}:${BOBA_MAINNET_NODE_VERSION:-v1.6.18}
     ports:
       - 15022:15022
       - 15022:15022/udp
diff --git a/op/geth/boba-sepolia-op-geth-pruned.yml b/op/geth/boba-sepolia-op-geth-pruned.yml
index 812abf49..e38e4c9c 100644
--- a/op/geth/boba-sepolia-op-geth-pruned.yml
+++ b/op/geth/boba-sepolia-op-geth-pruned.yml
@@ -2,7 +2,7 @@
 
 services:
   boba-sepolia:
-    image: ${BOBA_GETH_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/geth}:${BOBA_SEPOLIA_GETH_VERSION:-v1.101503.1}
+    image: ${BOBA_GETH_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/op-geth}:${BOBA_SEPOLIA_GETH_VERSION:-v1.101503.1}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
@@ -77,7 +77,7 @@ services:
       - traefik.http.routers.boba-sepolia-op-geth-pruned.middlewares=boba-sepolia-op-geth-pruned-stripprefix, ipwhitelist
 
   boba-sepolia-node:
-    image: ${BOBA_NODE_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/node}:${BOBA_SEPOLIA_NODE_VERSION:-v1.6.18}
+    image: ${BOBA_NODE_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/op-node}:${BOBA_SEPOLIA_NODE_VERSION:-v1.6.18}
     ports:
       - 15901:15901
       - 15901:15901/udp
diff --git a/op/geth/celo-alfajores-op-geth-archive-leveldb-hash.yml b/op/geth/celo-alfajores-op-geth-archive-leveldb-hash.yml
index 7c00506b..581077af 100644
--- a/op/geth/celo-alfajores-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/celo-alfajores-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   celo-alfajores-archive:
-    image: ${CELO_GETH_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/geth}:${CELO_ALFAJORES_GETH_VERSION:-celo-v2.0.0}
+    image: ${CELO_GETH_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/op-geth}:${CELO_ALFAJORES_GETH_VERSION:-celo-v2.0.0}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
@@ -77,7 +77,7 @@ services:
       - traefik.http.routers.celo-alfajores-op-geth-archive-leveldb-hash.middlewares=celo-alfajores-op-geth-archive-leveldb-hash-stripprefix, ipwhitelist
 
   celo-alfajores-archive-node:
-    image: ${CELO_NODE_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/node}:${CELO_ALFAJORES_NODE_VERSION:-celo-v2.0.0}
+    image: ${CELO_NODE_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/op-node}:${CELO_ALFAJORES_NODE_VERSION:-celo-v2.0.0}
     ports:
       - 15457:15457
       - 15457:15457/udp
diff --git a/op/geth/celo-alfajores-op-geth-pruned-pebble-path.yml b/op/geth/celo-alfajores-op-geth-pruned-pebble-path.yml
index 4a915dfa..06b166af 100644
--- a/op/geth/celo-alfajores-op-geth-pruned-pebble-path.yml
+++ b/op/geth/celo-alfajores-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   celo-alfajores:
-    image: ${CELO_GETH_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/geth}:${CELO_ALFAJORES_GETH_VERSION:-celo-v2.0.0}
+    image: ${CELO_GETH_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/op-geth}:${CELO_ALFAJORES_GETH_VERSION:-celo-v2.0.0}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
@@ -77,7 +77,7 @@ services:
       - traefik.http.routers.celo-alfajores-op-geth-pruned-pebble-path.middlewares=celo-alfajores-op-geth-pruned-pebble-path-stripprefix, ipwhitelist
 
   celo-alfajores-node:
-    image: ${CELO_NODE_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/node}:${CELO_ALFAJORES_NODE_VERSION:-celo-v2.0.0}
+    image: ${CELO_NODE_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/op-node}:${CELO_ALFAJORES_NODE_VERSION:-celo-v2.0.0}
     ports:
       - 15457:15457
       - 15457:15457/udp
diff --git a/op/geth/celo-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/celo-mainnet-op-geth-archive-leveldb-hash.yml
index f549d99e..a07e7f38 100644
--- a/op/geth/celo-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/celo-mainnet-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   celo-mainnet-archive:
-    image: ${CELO_GETH_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/geth}:${CELO_MAINNET_GETH_VERSION:-celo-v2.0.0}
+    image: ${CELO_GETH_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/op-geth}:${CELO_MAINNET_GETH_VERSION:-celo-v2.0.0}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
@@ -77,7 +77,7 @@ services:
       - traefik.http.routers.celo-mainnet-op-geth-archive-leveldb-hash.middlewares=celo-mainnet-op-geth-archive-leveldb-hash-stripprefix, ipwhitelist
 
   celo-mainnet-archive-node:
-    image: ${CELO_NODE_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/node}:${CELO_MAINNET_NODE_VERSION:-celo-v2.0.0}
+    image: ${CELO_NODE_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/op-node}:${CELO_MAINNET_NODE_VERSION:-celo-v2.0.0}
     ports:
       - 15993:15993
       - 15993:15993/udp
diff --git a/op/geth/celo-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/celo-mainnet-op-geth-pruned-pebble-path.yml
index 465a5a12..0629bff4 100644
--- a/op/geth/celo-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/celo-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   celo-mainnet:
-    image: ${CELO_GETH_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/geth}:${CELO_MAINNET_GETH_VERSION:-celo-v2.0.0}
+    image: ${CELO_GETH_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/op-geth}:${CELO_MAINNET_GETH_VERSION:-celo-v2.0.0}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
@@ -77,7 +77,7 @@ services:
       - traefik.http.routers.celo-mainnet-op-geth-pruned-pebble-path.middlewares=celo-mainnet-op-geth-pruned-pebble-path-stripprefix, ipwhitelist
 
   celo-mainnet-node:
-    image: ${CELO_NODE_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/node}:${CELO_MAINNET_NODE_VERSION:-celo-v2.0.0}
+    image: ${CELO_NODE_IMAGE:-us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/op-node}:${CELO_MAINNET_NODE_VERSION:-celo-v2.0.0}
     ports:
       - 15993:15993
       - 15993:15993/udp
diff --git a/op/geth/hashkeychain-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/hashkeychain-mainnet-op-geth-archive-leveldb-hash.yml
index 9f0cf9d3..64a0557d 100644
--- a/op/geth/hashkeychain-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/hashkeychain-mainnet-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   hashkeychain-mainnet-archive:
-    image: ${HASHKEYCHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${HASHKEYCHAIN_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${HASHKEYCHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${HASHKEYCHAIN_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml
index df2d937d..ea0e6bba 100644
--- a/op/geth/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   hashkeychain-mainnet:
-    image: ${HASHKEYCHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${HASHKEYCHAIN_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${HASHKEYCHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${HASHKEYCHAIN_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/ink-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/ink-mainnet-op-geth-archive-leveldb-hash.yml
index 3024b2d4..a913e2c0 100644
--- a/op/geth/ink-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/ink-mainnet-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   ink-mainnet-archive:
-    image: ${INK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${INK_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${INK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${INK_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/ink-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/ink-mainnet-op-geth-pruned-pebble-path.yml
index 0b1d5aac..a115e2dd 100644
--- a/op/geth/ink-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/ink-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   ink-mainnet:
-    image: ${INK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${INK_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${INK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${INK_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/ink-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/ink-sepolia-op-geth-archive-leveldb-hash.yml
index 7e702282..1c026542 100644
--- a/op/geth/ink-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/ink-sepolia-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   ink-sepolia-archive:
-    image: ${INK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${INK_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${INK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${INK_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/ink-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/ink-sepolia-op-geth-pruned-pebble-path.yml
index 6554bb37..478f66c6 100644
--- a/op/geth/ink-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/ink-sepolia-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   ink-sepolia:
-    image: ${INK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${INK_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${INK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${INK_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/lisk-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/lisk-mainnet-op-geth-archive-leveldb-hash.yml
index d699274e..32f30938 100644
--- a/op/geth/lisk-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/lisk-mainnet-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   lisk-mainnet-archive:
-    image: ${LISK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${LISK_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${LISK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${LISK_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/lisk-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/lisk-mainnet-op-geth-pruned-pebble-path.yml
index 98bdc015..5b8569f2 100644
--- a/op/geth/lisk-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/lisk-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   lisk-mainnet:
-    image: ${LISK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${LISK_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${LISK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${LISK_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/lisk-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/lisk-sepolia-op-geth-archive-leveldb-hash.yml
index 961abff4..1be8a8c9 100644
--- a/op/geth/lisk-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/lisk-sepolia-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   lisk-sepolia-archive:
-    image: ${LISK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${LISK_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${LISK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${LISK_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/lisk-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/lisk-sepolia-op-geth-pruned-pebble-path.yml
index fa9d57c9..5ec33a4b 100644
--- a/op/geth/lisk-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/lisk-sepolia-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   lisk-sepolia:
-    image: ${LISK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${LISK_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${LISK_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${LISK_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/metal-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/metal-mainnet-op-geth-archive-leveldb-hash.yml
index e0ffd6da..0b8513cf 100644
--- a/op/geth/metal-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/metal-mainnet-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   metal-mainnet-archive:
-    image: ${METAL_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${METAL_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${METAL_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${METAL_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/metal-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/metal-mainnet-op-geth-pruned-pebble-path.yml
index a40dcfbf..50547d8d 100644
--- a/op/geth/metal-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/metal-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   metal-mainnet:
-    image: ${METAL_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${METAL_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${METAL_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${METAL_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/metal-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/metal-sepolia-op-geth-archive-leveldb-hash.yml
index 091730e1..d3a00361 100644
--- a/op/geth/metal-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/metal-sepolia-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   metal-sepolia-archive:
-    image: ${METAL_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${METAL_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${METAL_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${METAL_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
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 a87dc718..6cd9a2a3 100644
--- a/op/geth/metal-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/metal-sepolia-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   metal-sepolia:
-    image: ${METAL_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${METAL_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${METAL_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${METAL_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/mode-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/mode-mainnet-op-geth-archive-leveldb-hash.yml
index 683de616..7ebe6580 100644
--- a/op/geth/mode-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/mode-mainnet-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   mode-mainnet-archive:
-    image: ${MODE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${MODE_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${MODE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${MODE_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/mode-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/mode-mainnet-op-geth-pruned-pebble-path.yml
index 6a830936..cea39092 100644
--- a/op/geth/mode-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/mode-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   mode-mainnet:
-    image: ${MODE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${MODE_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${MODE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${MODE_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/mode-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/mode-sepolia-op-geth-archive-leveldb-hash.yml
index c4bc2621..0fbd5c71 100644
--- a/op/geth/mode-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/mode-sepolia-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   mode-sepolia-archive:
-    image: ${MODE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${MODE_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${MODE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${MODE_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/mode-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/mode-sepolia-op-geth-pruned-pebble-path.yml
index dfd849b8..c003145e 100644
--- a/op/geth/mode-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/mode-sepolia-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   mode-sepolia:
-    image: ${MODE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${MODE_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${MODE_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${MODE_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/op-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/op-mainnet-op-geth-archive-leveldb-hash.yml
index 4d4d9aae..47fcafa6 100644
--- a/op/geth/op-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/op-mainnet-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   op-mainnet-archive:
-    image: ${OP_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${OP_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${OP_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${OP_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/op-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/op-mainnet-op-geth-pruned-pebble-path.yml
index 7822a2c9..6aaeaec7 100644
--- a/op/geth/op-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/op-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   op-mainnet:
-    image: ${OP_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${OP_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${OP_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${OP_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/op-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/op-sepolia-op-geth-archive-leveldb-hash.yml
index c8869c9a..408219da 100644
--- a/op/geth/op-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/op-sepolia-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   op-sepolia-archive:
-    image: ${OP_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${OP_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${OP_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${OP_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/op-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/op-sepolia-op-geth-pruned-pebble-path.yml
index 4dc1e3fa..dd2deebb 100644
--- a/op/geth/op-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/op-sepolia-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   op-sepolia:
-    image: ${OP_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${OP_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${OP_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${OP_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/snax-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/snax-mainnet-op-geth-archive-leveldb-hash.yml
index 89c78b70..64c3ee30 100644
--- a/op/geth/snax-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/snax-mainnet-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   snax-mainnet-archive:
-    image: ${SNAX_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${SNAX_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${SNAX_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${SNAX_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/snax-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/snax-mainnet-op-geth-pruned-pebble-path.yml
index 28840c8a..66c35c30 100644
--- a/op/geth/snax-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/snax-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   snax-mainnet:
-    image: ${SNAX_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${SNAX_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${SNAX_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${SNAX_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/soneium-minato-op-geth-archive-leveldb-hash.yml b/op/geth/soneium-minato-op-geth-archive-leveldb-hash.yml
index 2037ed15..d9ceeb21 100644
--- a/op/geth/soneium-minato-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/soneium-minato-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   soneium-minato-archive:
-    image: ${SONEIUM_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${SONEIUM_MINATO_GETH_VERSION:-v1.101503.3}
+    image: ${SONEIUM_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${SONEIUM_MINATO_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/soneium-minato-op-geth-pruned-pebble-path.yml b/op/geth/soneium-minato-op-geth-pruned-pebble-path.yml
index 83214a03..8efc8034 100644
--- a/op/geth/soneium-minato-op-geth-pruned-pebble-path.yml
+++ b/op/geth/soneium-minato-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   soneium-minato:
-    image: ${SONEIUM_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${SONEIUM_MINATO_GETH_VERSION:-v1.101503.3}
+    image: ${SONEIUM_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${SONEIUM_MINATO_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/swell-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/swell-mainnet-op-geth-archive-leveldb-hash.yml
index ef134868..0472b6a4 100644
--- a/op/geth/swell-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/swell-mainnet-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   swell-mainnet-archive:
-    image: ${SWELL_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${SWELL_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${SWELL_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${SWELL_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/swell-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/swell-mainnet-op-geth-pruned-pebble-path.yml
index 2878ca1c..4e9fdfcc 100644
--- a/op/geth/swell-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/swell-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   swell-mainnet:
-    image: ${SWELL_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${SWELL_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${SWELL_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${SWELL_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/unichain-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/unichain-mainnet-op-geth-archive-leveldb-hash.yml
index 2231e7d8..9c0c2ade 100644
--- a/op/geth/unichain-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/unichain-mainnet-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   unichain-mainnet-archive:
-    image: ${UNICHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${UNICHAIN_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${UNICHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${UNICHAIN_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/unichain-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/unichain-mainnet-op-geth-pruned-pebble-path.yml
index 4d46c624..93adf389 100644
--- a/op/geth/unichain-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/unichain-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   unichain-mainnet:
-    image: ${UNICHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${UNICHAIN_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${UNICHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${UNICHAIN_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/unichain-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/unichain-sepolia-op-geth-archive-leveldb-hash.yml
index 5598580a..4f02b7f1 100644
--- a/op/geth/unichain-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/unichain-sepolia-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   unichain-sepolia-archive:
-    image: ${UNICHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${UNICHAIN_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${UNICHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${UNICHAIN_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/unichain-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/unichain-sepolia-op-geth-pruned-pebble-path.yml
index caed7479..29e0bd20 100644
--- a/op/geth/unichain-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/unichain-sepolia-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   unichain-sepolia:
-    image: ${UNICHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${UNICHAIN_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${UNICHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${UNICHAIN_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/worldchain-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/worldchain-mainnet-op-geth-archive-leveldb-hash.yml
index 5464131d..ffcf198d 100644
--- a/op/geth/worldchain-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/worldchain-mainnet-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   worldchain-mainnet-archive:
-    image: ${WORLDCHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${WORLDCHAIN_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${WORLDCHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${WORLDCHAIN_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/worldchain-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/worldchain-mainnet-op-geth-pruned-pebble-path.yml
index f3af80dd..f71f70eb 100644
--- a/op/geth/worldchain-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/worldchain-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   worldchain-mainnet:
-    image: ${WORLDCHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${WORLDCHAIN_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${WORLDCHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${WORLDCHAIN_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/worldchain-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/worldchain-sepolia-op-geth-archive-leveldb-hash.yml
index 6d46b36b..c2b8a6ee 100644
--- a/op/geth/worldchain-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/worldchain-sepolia-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   worldchain-sepolia-archive:
-    image: ${WORLDCHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${WORLDCHAIN_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${WORLDCHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${WORLDCHAIN_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/worldchain-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/worldchain-sepolia-op-geth-pruned-pebble-path.yml
index 10ba370e..fa112307 100644
--- a/op/geth/worldchain-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/worldchain-sepolia-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   worldchain-sepolia:
-    image: ${WORLDCHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${WORLDCHAIN_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${WORLDCHAIN_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${WORLDCHAIN_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/zora-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/zora-mainnet-op-geth-archive-leveldb-hash.yml
index c15974d0..8ab10ccf 100644
--- a/op/geth/zora-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/zora-mainnet-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   zora-mainnet-archive:
-    image: ${ZORA_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${ZORA_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${ZORA_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${ZORA_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/zora-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/zora-mainnet-op-geth-pruned-pebble-path.yml
index c884feff..2ae4b676 100644
--- a/op/geth/zora-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/zora-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   zora-mainnet:
-    image: ${ZORA_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${ZORA_MAINNET_GETH_VERSION:-v1.101503.3}
+    image: ${ZORA_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${ZORA_MAINNET_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/zora-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/zora-sepolia-op-geth-archive-leveldb-hash.yml
index d4602877..4a84cb5d 100644
--- a/op/geth/zora-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/zora-sepolia-op-geth-archive-leveldb-hash.yml
@@ -2,7 +2,7 @@
 
 services:
   zora-sepolia-archive:
-    image: ${ZORA_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${ZORA_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${ZORA_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${ZORA_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
diff --git a/op/geth/zora-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/zora-sepolia-op-geth-pruned-pebble-path.yml
index f86ae955..21fcc4af 100644
--- a/op/geth/zora-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/zora-sepolia-op-geth-pruned-pebble-path.yml
@@ -2,7 +2,7 @@
 
 services:
   zora-sepolia:
-    image: ${ZORA_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/geth}:${ZORA_SEPOLIA_GETH_VERSION:-v1.101503.3}
+    image: ${ZORA_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${ZORA_SEPOLIA_GETH_VERSION:-v1.101503.3}
     user: root
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)