diff --git a/boba-mainnet.yml b/boba-mainnet.yml
new file mode 120000
index 00000000..0a525ae9
--- /dev/null
+++ b/boba-mainnet.yml
@@ -0,0 +1 @@
+op/geth/boba-mainnet-op-geth-pruned-pebble-path.yml
\ No newline at end of file
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 634358d0..adcf0aa7 100644
--- a/op/geth/base-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/base-mainnet-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   base-mainnet-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10596:10596"
-      - "10596:10596/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.base-mainnet-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/base-mainnet-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 5f3524df..250e474c 100644
--- a/op/geth/base-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/base-mainnet-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   base-mainnet:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10422:10422"
-      - "10422:10422/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.base-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/base-mainnet"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 70f4d954..25054890 100644
--- a/op/geth/base-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/base-sepolia-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   base-sepolia-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10910:10910"
-      - "10910:10910/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.base-sepolia-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/base-sepolia-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 62400273..17fd5565 100644
--- a/op/geth/base-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/base-sepolia-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   base-sepolia:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10022:10022"
-      - "10022:10022/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.base-sepolia-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/base-sepolia"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 275ae70d..2afc5380 100644
--- a/op/geth/bob-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/bob-mainnet-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   bob-mainnet-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10046:10046"
-      - "10046:10046/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.bob-mainnet-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/bob-mainnet-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
diff --git a/op/geth/bob-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/bob-mainnet-op-geth-pruned-pebble-path.yml
index a15d8271..7f711359 100644
--- a/op/geth/bob-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/bob-mainnet-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   bob-mainnet:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10347:10347"
-      - "10347:10347/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.bob-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/bob-mainnet"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
diff --git a/op/geth/boba-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/boba-mainnet-op-geth-pruned-pebble-path.yml
new file mode 100644
index 00000000..e5ba62b4
--- /dev/null
+++ b/op/geth/boba-mainnet-op-geth-pruned-pebble-path.yml
@@ -0,0 +1,106 @@
+
+
+services:
+  boba-mainnet:
+    build:
+      context: ./op
+      args:
+         GETH_REPO: https://github.com/bobanetwork/op-geth.git
+         OP_REPO: https://github.com/bobanetwork/boba.git         
+         OP_VERSION: v1.6.18
+         GETH_VERSION: v1.101411.0
+         
+    expose:
+      - 8545
+      - 6060       
+    ports:
+      - ":"
+      - ":/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
+    stop_grace_period: 3m    
+    volumes:
+      - boba-mainnet-op-geth-pruned-pebble-path:/data
+      - .jwtsecret:/jwtsecret
+    environment:
+      - "GETH_DATADIR=/data"
+      - "GETH_OP_NETWORK=boba-mainnet"
+      - "GETH_GCMODE=full"
+      - "GETH_SYNCMODE=snap"      
+      - "GETH_STATE_SCHEME=path"
+      - "GETH_DB_ENGINE=pebble"
+      - "GETH_NAT=extip:${IP}"
+      - "GETH_PORT="
+      - "GETH_WS_PORT=8545"
+      - "GETH_HTTP=true"
+      - "GETH_HTTP_ADDR=0.0.0.0"
+      - "GETH_HTTP_VHOSTS=*"
+      - "GETH_WS=true"
+      - "GETH_WS_ADDR=0.0.0.0"
+      - "GETH_WS_ORIGINS=*"
+      - "GETH_HTTP_API=eth,net,debug,admin,web3"
+      - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
+      - "GETH_AUTHRPC_ADDR=0.0.0.0"
+      - "GETH_AUTHRPC_VHOSTS=*"
+      - "GETH_ROLLUP_SEQUENCERHTTP=https://mainnet.boba.network"
+    labels:                     
+      - "traefik.enable=true"
+      - "traefik.http.middlewares.boba-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/boba-mainnet"                      
+      - "traefik.http.services.boba-mainnet-op-geth-pruned-pebble-path.loadbalancer.server.port=8545"
+      - "traefik.http.routers.boba-mainnet-op-geth-pruned-pebble-path.entrypoints=websecure"                                              
+      - "traefik.http.routers.boba-mainnet-op-geth-pruned-pebble-path.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.boba-mainnet-op-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && PathPrefix(`/boba-mainnet`)"                     
+      - "traefik.http.routers.boba-mainnet-op-geth-pruned-pebble-path.middlewares=boba-mainnet-op-geth-pruned-pebble-path-stripprefix, ipwhitelist"                           
+    networks:                                                                                         
+      - chains
+
+      
+  boba-mainnet-node:
+    build:
+      context: ./op
+      args:
+         GETH_REPO: https://github.com/bobanetwork/op-geth.git
+         OP_REPO: https://github.com/bobanetwork/boba.git         
+         OP_VERSION: v1.6.18
+         GETH_VERSION: v1.101411.0
+         
+    expose:
+      - 8545
+      - 7300
+      - 6060
+    ports:
+      - "15624:15624"
+      - "15624:15624/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
+    volumes:
+      - .jwtsecret:/jwtsecret
+    stop_grace_period: 30s
+    environment:
+      - "OP_NODE_NETWORK=boba-mainnet"
+      - "OP_NODE_SYNCMODE=execution-layer"
+      - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
+      - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
+      - "OP_NODE_L2_ENGINE_RPC=http://boba-mainnet:8551"
+      - "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_P2P_LISTEN_IP=0.0.0.0"
+      - "OP_NODE_P2P_LISTEN_TCP_PORT=15624"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15624"
+      - "OP_NODE_RPC_ADDR=0.0.0.0"
+      - "OP_NODE_P2P_ADVERTISE_IP=${IP}"
+      - "OP_NODE_RPC_PORT=8545"
+      - "OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log"
+      - "OP_NODE_VERIFIER_L1_CONFS=4"
+      - "OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}"
+      - "OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}"
+      - "OP_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}"
+      - "OP_NODE_L1_BEACON_ARCHIVER=${ETHEREUM_MAINNET_BEACON_ARCHIVER}"
+      
+    networks:                                                                                         
+      - chains
+      
+volumes:  
+  boba-mainnet-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/op/geth/boba-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/boba-sepolia-op-geth-pruned-pebble-path.yml
new file mode 100644
index 00000000..bf60dcaf
--- /dev/null
+++ b/op/geth/boba-sepolia-op-geth-pruned-pebble-path.yml
@@ -0,0 +1,106 @@
+
+
+services:
+  boba-sepolia:
+    build:
+      context: ./op
+      args:
+         GETH_REPO: https://github.com/bobanetwork/op-geth.git
+         OP_REPO: https://github.com/bobanetwork/boba.git         
+         OP_VERSION: v1.6.18
+         GETH_VERSION: v1.101411.0
+         
+    expose:
+      - 8545
+      - 6060       
+    ports:
+      - ":"
+      - ":/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
+    stop_grace_period: 3m    
+    volumes:
+      - boba-sepolia-op-geth-pruned-pebble-path:/data
+      - .jwtsecret:/jwtsecret
+    environment:
+      - "GETH_DATADIR=/data"
+      - "GETH_OP_NETWORK=boba-sepolia"
+      - "GETH_GCMODE=full"
+      - "GETH_SYNCMODE=snap"      
+      - "GETH_STATE_SCHEME=path"
+      - "GETH_DB_ENGINE=pebble"
+      - "GETH_NAT=extip:${IP}"
+      - "GETH_PORT="
+      - "GETH_WS_PORT=8545"
+      - "GETH_HTTP=true"
+      - "GETH_HTTP_ADDR=0.0.0.0"
+      - "GETH_HTTP_VHOSTS=*"
+      - "GETH_WS=true"
+      - "GETH_WS_ADDR=0.0.0.0"
+      - "GETH_WS_ORIGINS=*"
+      - "GETH_HTTP_API=eth,net,debug,admin,web3"
+      - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
+      - "GETH_AUTHRPC_ADDR=0.0.0.0"
+      - "GETH_AUTHRPC_VHOSTS=*"
+      - "GETH_ROLLUP_SEQUENCERHTTP=https://sepolia.boba.network"
+    labels:                     
+      - "traefik.enable=true"
+      - "traefik.http.middlewares.boba-sepolia-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/boba-sepolia"                      
+      - "traefik.http.services.boba-sepolia-op-geth-pruned-pebble-path.loadbalancer.server.port=8545"
+      - "traefik.http.routers.boba-sepolia-op-geth-pruned-pebble-path.entrypoints=websecure"                                              
+      - "traefik.http.routers.boba-sepolia-op-geth-pruned-pebble-path.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.boba-sepolia-op-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && PathPrefix(`/boba-sepolia`)"                     
+      - "traefik.http.routers.boba-sepolia-op-geth-pruned-pebble-path.middlewares=boba-sepolia-op-geth-pruned-pebble-path-stripprefix, ipwhitelist"                           
+    networks:                                                                                         
+      - chains
+
+      
+  boba-sepolia-node:
+    build:
+      context: ./op
+      args:
+         GETH_REPO: https://github.com/bobanetwork/op-geth.git
+         OP_REPO: https://github.com/bobanetwork/boba.git         
+         OP_VERSION: v1.6.18
+         GETH_VERSION: v1.101411.0
+         
+    expose:
+      - 8545
+      - 7300
+      - 6060
+    ports:
+      - "15962:15962"
+      - "15962:15962/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
+    volumes:
+      - .jwtsecret:/jwtsecret
+    stop_grace_period: 30s
+    environment:
+      - "OP_NODE_NETWORK=boba-sepolia"
+      - "OP_NODE_SYNCMODE=execution-layer"
+      - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
+      - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
+      - "OP_NODE_L2_ENGINE_RPC=http://boba-sepolia:8551"
+      - "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_P2P_LISTEN_IP=0.0.0.0"
+      - "OP_NODE_P2P_LISTEN_TCP_PORT=15962"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15962"
+      - "OP_NODE_RPC_ADDR=0.0.0.0"
+      - "OP_NODE_P2P_ADVERTISE_IP=${IP}"
+      - "OP_NODE_RPC_PORT=8545"
+      - "OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log"
+      - "OP_NODE_VERIFIER_L1_CONFS=4"
+      - "OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}"
+      - "OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}"
+      - "OP_NODE_L1_BEACON=${ETHEREUM_SEPOLIA_BEACON_REST}"
+      - "OP_NODE_L1_BEACON_ARCHIVER=${ETHEREUM_SEPOLIA_BEACON_ARCHIVER}"
+      - "OP_NODE_OVERRIDE_PECTRABLOBSCHEDULE=1742486400"
+    networks:                                                                                         
+      - chains
+      
+volumes:  
+  boba-sepolia-op-geth-pruned-pebble-path:
\ No newline at end of file
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 d107b444..c1bcfae9 100644
--- a/op/geth/hashkeychain-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/hashkeychain-mainnet-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   hashkeychain-mainnet-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10113:10113"
-      - "10113:10113/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.hashkeychain-mainnet-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/hashkeychain-mainnet-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 d4d6b968..4ef9b98e 100644
--- a/op/geth/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   hashkeychain-mainnet:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10188:10188"
-      - "10188:10188/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.hashkeychain-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/hashkeychain-mainnet"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 d684031e..b7e7d616 100644
--- a/op/geth/ink-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/ink-mainnet-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   ink-mainnet-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10713:10713"
-      - "10713:10713/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.ink-mainnet-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/ink-mainnet-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 3d27218e..611886af 100644
--- a/op/geth/ink-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/ink-mainnet-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   ink-mainnet:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10271:10271"
-      - "10271:10271/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.ink-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/ink-mainnet"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 27e8cf05..21359467 100644
--- a/op/geth/ink-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/ink-sepolia-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   ink-sepolia-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10659:10659"
-      - "10659:10659/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.ink-sepolia-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/ink-sepolia-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 843110c3..e844d5af 100644
--- a/op/geth/ink-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/ink-sepolia-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   ink-sepolia:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10869:10869"
-      - "10869:10869/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.ink-sepolia-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/ink-sepolia"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 22c22df6..4086d9b2 100644
--- a/op/geth/lisk-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/lisk-mainnet-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   lisk-mainnet-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10157:10157"
-      - "10157:10157/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.lisk-mainnet-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/lisk-mainnet-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 c3fc8b5a..871689be 100644
--- a/op/geth/lisk-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/lisk-mainnet-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   lisk-mainnet:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10971:10971"
-      - "10971:10971/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.lisk-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/lisk-mainnet"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 0dcbbeec..cc1820d6 100644
--- a/op/geth/lisk-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/lisk-sepolia-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   lisk-sepolia-archive:
     build:
       context: ./op
       args:
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
          OP_VERSION: v1.12.1
          GETH_VERSION: v1.101503.1
          OP_PATCH: sepolia/lisk/op-node.patch
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10457:10457"
-      - "10457:10457/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.lisk-sepolia-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/lisk-sepolia-archive"                      
@@ -54,6 +59,8 @@ services:
     build:
       context: ./op
       args:
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
          OP_VERSION: v1.12.1
          GETH_VERSION: v1.101503.1
          OP_PATCH: sepolia/lisk/op-node.patch
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 c9093bf8..b0f4e94b 100644
--- a/op/geth/lisk-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/lisk-sepolia-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   lisk-sepolia:
     build:
       context: ./op
       args:
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
          OP_VERSION: v1.12.1
          GETH_VERSION: v1.101503.1
          OP_PATCH: sepolia/lisk/op-node.patch
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10490:10490"
-      - "10490:10490/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.lisk-sepolia-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/lisk-sepolia"                      
@@ -54,6 +59,8 @@ services:
     build:
       context: ./op
       args:
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
          OP_VERSION: v1.12.1
          GETH_VERSION: v1.101503.1
          OP_PATCH: sepolia/lisk/op-node.patch
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 9d8e50c7..de7e7ab2 100644
--- a/op/geth/metal-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/metal-mainnet-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   metal-mainnet-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10324:10324"
-      - "10324:10324/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.metal-mainnet-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/metal-mainnet-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 e0213172..0de438e7 100644
--- a/op/geth/metal-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/metal-mainnet-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   metal-mainnet:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10821:10821"
-      - "10821:10821/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.metal-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/metal-mainnet"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 04608b92..685d8e70 100644
--- a/op/geth/metal-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/metal-sepolia-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   metal-sepolia-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10770:10770"
-      - "10770:10770/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.metal-sepolia-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/metal-sepolia-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 8b407f28..8eeab9a3 100644
--- a/op/geth/metal-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/metal-sepolia-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   metal-sepolia:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10701:10701"
-      - "10701:10701/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.metal-sepolia-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/metal-sepolia"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 126b2f51..50ab31de 100644
--- a/op/geth/mode-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/mode-mainnet-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   mode-mainnet-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10430:10430"
-      - "10430:10430/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.mode-mainnet-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/mode-mainnet-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 4e905b17..c04d9d1c 100644
--- a/op/geth/mode-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/mode-mainnet-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   mode-mainnet:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10054:10054"
-      - "10054:10054/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.mode-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/mode-mainnet"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 29efe3ca..f065d2d8 100644
--- a/op/geth/mode-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/mode-sepolia-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   mode-sepolia-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10835:10835"
-      - "10835:10835/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.mode-sepolia-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/mode-sepolia-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 469c5ed3..ae35d04d 100644
--- a/op/geth/mode-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/mode-sepolia-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   mode-sepolia:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10308:10308"
-      - "10308:10308/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.mode-sepolia-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/mode-sepolia"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 6e977823..4d3eacad 100644
--- a/op/geth/op-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/op-mainnet-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   op-mainnet-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10399:10399"
-      - "10399:10399/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.op-mainnet-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/op-mainnet-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 d71ac7ce..af0da793 100644
--- a/op/geth/op-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/op-mainnet-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   op-mainnet:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10687:10687"
-      - "10687:10687/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.op-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/op-mainnet"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 002e3b9c..6dde3d7f 100644
--- a/op/geth/op-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/op-sepolia-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   op-sepolia-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10257:10257"
-      - "10257:10257/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.op-sepolia-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/op-sepolia-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 2d53f29c..ea50e4b8 100644
--- a/op/geth/op-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/op-sepolia-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   op-sepolia:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10981:10981"
-      - "10981:10981/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.op-sepolia-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/op-sepolia"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 8bd0d375..521d8147 100644
--- a/op/geth/snax-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/snax-mainnet-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   snax-mainnet-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10249:10249"
-      - "10249:10249/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.snax-mainnet-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/snax-mainnet-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 a7e40663..fdb68f6b 100644
--- a/op/geth/snax-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/snax-mainnet-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   snax-mainnet:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10332:10332"
-      - "10332:10332/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.snax-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/snax-mainnet"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 c4ea7482..623f60c7 100644
--- a/op/geth/swell-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/swell-mainnet-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   swell-mainnet-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10863:10863"
-      - "10863:10863/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.swell-mainnet-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/swell-mainnet-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 0bbe7c30..f292dd20 100644
--- a/op/geth/swell-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/swell-mainnet-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   swell-mainnet:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10312:10312"
-      - "10312:10312/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.swell-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/swell-mainnet"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 a616fe0e..684b04b4 100644
--- a/op/geth/unichain-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/unichain-mainnet-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   unichain-mainnet-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10789:10789"
-      - "10789:10789/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.unichain-mainnet-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/unichain-mainnet-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 170c5303..20fef1b6 100644
--- a/op/geth/unichain-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/unichain-mainnet-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   unichain-mainnet:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10954:10954"
-      - "10954:10954/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.unichain-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/unichain-mainnet"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 bc9571a5..12163919 100644
--- a/op/geth/unichain-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/unichain-sepolia-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   unichain-sepolia-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10589:10589"
-      - "10589:10589/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.unichain-sepolia-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/unichain-sepolia-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 1bb40054..52e1fd30 100644
--- a/op/geth/unichain-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/unichain-sepolia-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   unichain-sepolia:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10226:10226"
-      - "10226:10226/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.unichain-sepolia-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/unichain-sepolia"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 1163a666..9c9b9146 100644
--- a/op/geth/worldchain-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/worldchain-mainnet-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   worldchain-mainnet-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10162:10162"
-      - "10162:10162/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.worldchain-mainnet-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/worldchain-mainnet-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 7978a638..980a16df 100644
--- a/op/geth/worldchain-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/worldchain-mainnet-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   worldchain-mainnet:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10096:10096"
-      - "10096:10096/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.worldchain-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/worldchain-mainnet"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 e4b5c8a3..6f2f68f9 100644
--- a/op/geth/worldchain-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/worldchain-sepolia-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   worldchain-sepolia-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10720:10720"
-      - "10720:10720/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.worldchain-sepolia-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/worldchain-sepolia-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 e2d17cc6..42545ed5 100644
--- a/op/geth/worldchain-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/worldchain-sepolia-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   worldchain-sepolia:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10620:10620"
-      - "10620:10620/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.worldchain-sepolia-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/worldchain-sepolia"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 ee93c3f2..a92c8261 100644
--- a/op/geth/zora-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/zora-mainnet-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   zora-mainnet-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10066:10066"
-      - "10066:10066/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.zora-mainnet-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/zora-mainnet-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 7cda1879..7f5c7983 100644
--- a/op/geth/zora-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/zora-mainnet-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   zora-mainnet:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10714:10714"
-      - "10714:10714/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.zora-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/zora-mainnet"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 c2636098..8a672355 100644
--- a/op/geth/zora-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/zora-sepolia-op-geth-archive-leveldb-hash.yml
@@ -1,17 +1,21 @@
+
+
 services:
   zora-sepolia-archive:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10308:10308"
-      - "10308:10308/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=hash"
       - "GETH_DB_ENGINE=leveldb"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.zora-sepolia-op-geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/zora-sepolia-archive"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545
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 d140d27f..d1d80be5 100644
--- a/op/geth/zora-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/zora-sepolia-op-geth-pruned-pebble-path.yml
@@ -1,17 +1,21 @@
+
+
 services:
   zora-sepolia:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
-      - 8545       
+      - 8545
       - 6060       
     ports:
-      - "10083:10083"
-      - "10083:10083/udp"
+      - ":"
+      - ":/udp"
     entrypoint: [ "./geth" ]
     restart: unless-stopped
     stop_grace_period: 3m    
@@ -26,7 +30,7 @@ services:
       - "GETH_STATE_SCHEME=path"
       - "GETH_DB_ENGINE=pebble"
       - "GETH_NAT=extip:${IP}"
-      - "GETH_PORT=19809"
+      - "GETH_PORT="
       - "GETH_WS_PORT=8545"
       - "GETH_HTTP=true"
       - "GETH_HTTP_ADDR=0.0.0.0"
@@ -38,6 +42,7 @@ services:
       - "GETH_AUTHRPC_JWTSECRET=/jwtsecret"
       - "GETH_AUTHRPC_ADDR=0.0.0.0"
       - "GETH_AUTHRPC_VHOSTS=*"
+      
     labels:                     
       - "traefik.enable=true"
       - "traefik.http.middlewares.zora-sepolia-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/zora-sepolia"                      
@@ -54,8 +59,10 @@ services:
     build:
       context: ./op
       args:
-         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
-         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         GETH_REPO: https://github.com/ethereum-optimism/op-geth.git
+         OP_REPO: https://github.com/ethereum-optimism/optimism.git         
+         OP_VERSION: v1.12.2
+         GETH_VERSION: v1.101503.1
          
     expose:
       - 8545