diff --git a/op/geth/bnb-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/bnb-mainnet-op-geth-archive-leveldb-hash.yml
index 037ae4ee..ab7510aa 100644
--- a/op/geth/bnb-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/bnb-mainnet-op-geth-archive-leveldb-hash.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   bnb-mainnet-archive:
-    image: ${BNB_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${BNB_MAINNET_GETH_VERSION:-v1.101603.4}
+    image: ${BNB_GETH_IMAGE:-ghcr.io/bnb-chain/op-geth}:${BNB_MAINNET_GETH_VERSION:-v0.5.8}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -57,6 +57,7 @@ services:
       - GETH_ROLLUP_SEQUENCERHTTP=https://opbnb-mainnet-rpc.bnbchain.org
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
+      - --bootnodes=enr:-KO4QHs5qh_kPFcjMgqkuN9dbxXT4C5Cjad4SAheaUxveCbJQ3XdeMMDHeHilHyqisyYQAByfdhzyKAdUp2SvyzWeBqGAYvRDf80g2V0aMfGhHFtSjqAgmlkgnY0gmlwhDaykUmJc2VjcDI1NmsxoQJUevTL3hJwj21IT2GC6VaNqVQEsJFPtNtO-ld5QTNCfIRzbmFwwIN0Y3CCdl-DdWRwgnZf,enr:-KO4QKIByq-YMjs6IL2YCNZEmlo3dKWNOy4B6sdqE3gjOrXeKdNbwZZGK_JzT1epqCFs3mujjg2vO1lrZLzLy4Rl7PyGAYvRA8bEg2V0aMfGhHFtSjqAgmlkgnY0gmlwhDbjSM6Jc2VjcDI1NmsxoQNQhJ5pqCPnTbK92gEc2F98y-u1OgZVAI1Msx-UiHezY4RzbmFwwIN0Y3CCdl-DdWRwgnZf
       - --datadir=/data
       - --db.engine=leveldb
       - --gcmode=archive
@@ -107,7 +108,7 @@ services:
       - traefik.http.routers.bnb-mainnet-op-geth-archive-leveldb-hash.middlewares=bnb-mainnet-op-geth-archive-leveldb-hash-stripprefix, ipallowlist
 
   bnb-mainnet-archive-node:
-    image: ${BNB_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BNB_MAINNET_NODE_VERSION:-v1.16.1}
+    image: ${BNB_NODE_IMAGE:-ghcr.io/bnb-chain/op-node}:${BNB_MAINNET_NODE_VERSION:-v0.5.4}
     ports:
       - 16402:16402
       - 16402:16402/udp
diff --git a/op/geth/bnb-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/bnb-mainnet-op-geth-pruned-pebble-path.yml
index 3b807699..3917fa14 100644
--- a/op/geth/bnb-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/bnb-mainnet-op-geth-pruned-pebble-path.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   bnb-mainnet:
-    image: ${BNB_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${BNB_MAINNET_GETH_VERSION:-v1.101603.4}
+    image: ${BNB_GETH_IMAGE:-ghcr.io/bnb-chain/op-geth}:${BNB_MAINNET_GETH_VERSION:-v0.5.8}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -58,6 +58,7 @@ services:
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
       - --allow-insecure-no-tries
+      - --bootnodes=enr:-KO4QHs5qh_kPFcjMgqkuN9dbxXT4C5Cjad4SAheaUxveCbJQ3XdeMMDHeHilHyqisyYQAByfdhzyKAdUp2SvyzWeBqGAYvRDf80g2V0aMfGhHFtSjqAgmlkgnY0gmlwhDaykUmJc2VjcDI1NmsxoQJUevTL3hJwj21IT2GC6VaNqVQEsJFPtNtO-ld5QTNCfIRzbmFwwIN0Y3CCdl-DdWRwgnZf,enr:-KO4QKIByq-YMjs6IL2YCNZEmlo3dKWNOy4B6sdqE3gjOrXeKdNbwZZGK_JzT1epqCFs3mujjg2vO1lrZLzLy4Rl7PyGAYvRA8bEg2V0aMfGhHFtSjqAgmlkgnY0gmlwhDbjSM6Jc2VjcDI1NmsxoQNQhJ5pqCPnTbK92gEc2F98y-u1OgZVAI1Msx-UiHezY4RzbmFwwIN0Y3CCdl-DdWRwgnZf
       - --datadir=/data
       - --db.engine=pebble
       - --gcmode=full
@@ -108,7 +109,7 @@ services:
       - traefik.http.routers.bnb-mainnet-op-geth-pruned-pebble-path.middlewares=bnb-mainnet-op-geth-pruned-pebble-path-stripprefix, ipallowlist
 
   bnb-mainnet-node:
-    image: ${BNB_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BNB_MAINNET_NODE_VERSION:-v1.16.1}
+    image: ${BNB_NODE_IMAGE:-ghcr.io/bnb-chain/op-node}:${BNB_MAINNET_NODE_VERSION:-v0.5.4}
     ports:
       - 17599:17599
       - 17599:17599/udp
diff --git a/op/geth/bnb-testnet-op-geth-archive-leveldb-hash.yml b/op/geth/bnb-testnet-op-geth-archive-leveldb-hash.yml
index 7605b525..3e57d0cd 100644
--- a/op/geth/bnb-testnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/bnb-testnet-op-geth-archive-leveldb-hash.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   bnb-testnet-archive:
-    image: ${BNB_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${BNB_TESTNET_GETH_VERSION:-v1.101603.4}
+    image: ${BNB_GETH_IMAGE:-ghcr.io/bnb-chain/op-geth}:${BNB_TESTNET_GETH_VERSION:-v0.5.8}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -57,6 +57,7 @@ services:
       - GETH_ROLLUP_SEQUENCERHTTP=https://opbnb-testnet-rpc.bnbchain.org
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
+      - --bootnodes=enr:-KO4QKFOBDW--pF4pFwv3Al_jiLOITj_Y5mr1Ajyy2yxHpFtNcBfkZEkvWUxAKXQjWALZEFxYHooU88JClyzA00e8YeGAYtBOOZig2V0aMfGhE0ZYGqAgmlkgnY0gmlwhDREiqaJc2VjcDI1NmsxoQM8pC_6wwTr5N2Q-yXQ1KGKsgz9i9EPLk8Ata65pUyYG4RzbmFwwIN0Y3CCdl-DdWRwgnZf,enr:-KO4QFJc0KR09ye818GT2kyN9y6BAGjhz77sYimxn85jJf2hOrNqg4X0b0EsS-_ssdkzVpavqh6oMX7W5Y81xMRuEayGAYtBSiK9g2V0aMfGhE0ZYGqAgmlkgnY0gmlwhANzx96Jc2VjcDI1NmsxoQPwA1XHfWGd4umIt7j3Fc7hKq_35izIWT_9yiN_tX8lR4RzbmFwwIN0Y3CCdl-DdWRwgnZf
       - --datadir=/data
       - --db.engine=leveldb
       - --gcmode=archive
@@ -107,7 +108,7 @@ services:
       - traefik.http.routers.bnb-testnet-op-geth-archive-leveldb-hash.middlewares=bnb-testnet-op-geth-archive-leveldb-hash-stripprefix, ipallowlist
 
   bnb-testnet-archive-node:
-    image: ${BNB_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BNB_TESTNET_NODE_VERSION:-v1.16.1}
+    image: ${BNB_NODE_IMAGE:-ghcr.io/bnb-chain/op-node}:${BNB_TESTNET_NODE_VERSION:-v0.5.4}
     ports:
       - 15163:15163
       - 15163:15163/udp
diff --git a/op/geth/bnb-testnet-op-geth-pruned-pebble-path.yml b/op/geth/bnb-testnet-op-geth-pruned-pebble-path.yml
index 766c9a1d..10a19b7d 100644
--- a/op/geth/bnb-testnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/bnb-testnet-op-geth-pruned-pebble-path.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   bnb-testnet:
-    image: ${BNB_GETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth}:${BNB_TESTNET_GETH_VERSION:-v1.101603.4}
+    image: ${BNB_GETH_IMAGE:-ghcr.io/bnb-chain/op-geth}:${BNB_TESTNET_GETH_VERSION:-v0.5.8}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -58,6 +58,7 @@ services:
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
       - --allow-insecure-no-tries
+      - --bootnodes=enr:-KO4QKFOBDW--pF4pFwv3Al_jiLOITj_Y5mr1Ajyy2yxHpFtNcBfkZEkvWUxAKXQjWALZEFxYHooU88JClyzA00e8YeGAYtBOOZig2V0aMfGhE0ZYGqAgmlkgnY0gmlwhDREiqaJc2VjcDI1NmsxoQM8pC_6wwTr5N2Q-yXQ1KGKsgz9i9EPLk8Ata65pUyYG4RzbmFwwIN0Y3CCdl-DdWRwgnZf,enr:-KO4QFJc0KR09ye818GT2kyN9y6BAGjhz77sYimxn85jJf2hOrNqg4X0b0EsS-_ssdkzVpavqh6oMX7W5Y81xMRuEayGAYtBSiK9g2V0aMfGhE0ZYGqAgmlkgnY0gmlwhANzx96Jc2VjcDI1NmsxoQPwA1XHfWGd4umIt7j3Fc7hKq_35izIWT_9yiN_tX8lR4RzbmFwwIN0Y3CCdl-DdWRwgnZf
       - --datadir=/data
       - --db.engine=pebble
       - --gcmode=full
@@ -108,7 +109,7 @@ services:
       - traefik.http.routers.bnb-testnet-op-geth-pruned-pebble-path.middlewares=bnb-testnet-op-geth-pruned-pebble-path-stripprefix, ipallowlist
 
   bnb-testnet-node:
-    image: ${BNB_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BNB_TESTNET_NODE_VERSION:-v1.16.1}
+    image: ${BNB_NODE_IMAGE:-ghcr.io/bnb-chain/op-node}:${BNB_TESTNET_NODE_VERSION:-v0.5.4}
     ports:
       - 18187:18187
       - 18187:18187/udp