diff --git a/base-mainnet-op-geth-pruned-pebble-path.yml b/base-mainnet-op-geth-pruned-pebble-path.yml
new file mode 100644
index 00000000..c390fa53
--- /dev/null
+++ b/base-mainnet-op-geth-pruned-pebble-path.yml
@@ -0,0 +1,95 @@
+services:
+  base-mainnet:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545       
+      - 6060       
+    ports:
+      - "10503:10503"
+      - "10503:10503/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
+    stop_grace_period: 3m    
+    volumes:
+      - base-mainnet-op-geth-pruned-pebble-path:/data
+      - .jwtsecret:/jwtsecret
+    environment:
+      - "GETH_DATADIR=/data"
+      - "GETH_OP_NETWORK=base-mainnet"
+      - "GETH_GCMODE=full"
+      - "GETH_SYNCMODE=snap"
+      - "GETH_STATE_SCHEME=path"
+      - "GETH_DB_ENGINE=pebble"
+      - "GETH_NAT=extip:${IP}"
+      - "GETH_PORT=19809"
+      - "GETH_WS_PORT=8545"
+      - "GETH_HTTP_ADDR=0.0.0.0"
+      - "GETH_WS_ADDR=0.0.0.0"
+      - "GETH_HTTP_API=eth,net,debug,admin,web3"
+      - "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-stripprefix.stripprefix.prefixes=/base-mainnet"                      
+      - "traefik.http.services.base-mainnet-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.base-mainnet-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.base-mainnet-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.base-mainnet-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/base-mainnet`)"                     
+      - "traefik.http.routers.base-mainnet-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
+    networks:                                                                                         
+      - chains
+
+      
+  base-mainnet-node:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545
+      - 7300
+      - 6060
+    ports:
+      - "15503:15503"
+      - "15503:15503/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
+    volumes:
+      - .jwtsecret:/jwtsecret
+    stop_grace_period: 30s
+    environment:
+      - "OP_NODE_NETWORK=base-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://base-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=15503"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15503"
+      - "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:  
+    base-mainnet-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/base-sepolia-op-geth-pruned-pebble-path.yml b/base-sepolia-op-geth-pruned-pebble-path.yml
new file mode 100644
index 00000000..7be38ea9
--- /dev/null
+++ b/base-sepolia-op-geth-pruned-pebble-path.yml
@@ -0,0 +1,95 @@
+services:
+  base-sepolia:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545       
+      - 6060       
+    ports:
+      - "10800:10800"
+      - "10800:10800/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
+    stop_grace_period: 3m    
+    volumes:
+      - base-sepolia-op-geth-pruned-pebble-path:/data
+      - .jwtsecret:/jwtsecret
+    environment:
+      - "GETH_DATADIR=/data"
+      - "GETH_OP_NETWORK=base-sepolia"
+      - "GETH_GCMODE=full"
+      - "GETH_SYNCMODE=snap"
+      - "GETH_STATE_SCHEME=path"
+      - "GETH_DB_ENGINE=pebble"
+      - "GETH_NAT=extip:${IP}"
+      - "GETH_PORT=19809"
+      - "GETH_WS_PORT=8545"
+      - "GETH_HTTP_ADDR=0.0.0.0"
+      - "GETH_WS_ADDR=0.0.0.0"
+      - "GETH_HTTP_API=eth,net,debug,admin,web3"
+      - "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-stripprefix.stripprefix.prefixes=/base-sepolia"                      
+      - "traefik.http.services.base-sepolia-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.base-sepolia-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.base-sepolia-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.base-sepolia-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/base-sepolia`)"                     
+      - "traefik.http.routers.base-sepolia-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
+    networks:                                                                                         
+      - chains
+
+      
+  base-sepolia-node:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545
+      - 7300
+      - 6060
+    ports:
+      - "15800:15800"
+      - "15800:15800/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
+    volumes:
+      - .jwtsecret:/jwtsecret
+    stop_grace_period: 30s
+    environment:
+      - "OP_NODE_NETWORK=base-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://base-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=15800"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15800"
+      - "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:  
+    base-sepolia-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/bob-mainnet-op-geth-pruned-pebble-path.yml b/bob-mainnet-op-geth-pruned-pebble-path.yml
new file mode 100644
index 00000000..d208bf7e
--- /dev/null
+++ b/bob-mainnet-op-geth-pruned-pebble-path.yml
@@ -0,0 +1,95 @@
+services:
+  bob-mainnet:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545       
+      - 6060       
+    ports:
+      - "10205:10205"
+      - "10205:10205/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
+    stop_grace_period: 3m    
+    volumes:
+      - bob-mainnet-op-geth-pruned-pebble-path:/data
+      - .jwtsecret:/jwtsecret
+    environment:
+      - "GETH_DATADIR=/data"
+      - "GETH_OP_NETWORK=bob-mainnet"
+      - "GETH_GCMODE=full"
+      - "GETH_SYNCMODE=snap"
+      - "GETH_STATE_SCHEME=path"
+      - "GETH_DB_ENGINE=pebble"
+      - "GETH_NAT=extip:${IP}"
+      - "GETH_PORT=19809"
+      - "GETH_WS_PORT=8545"
+      - "GETH_HTTP_ADDR=0.0.0.0"
+      - "GETH_WS_ADDR=0.0.0.0"
+      - "GETH_HTTP_API=eth,net,debug,admin,web3"
+      - "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-stripprefix.stripprefix.prefixes=/bob-mainnet"                      
+      - "traefik.http.services.bob-mainnet-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.bob-mainnet-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.bob-mainnet-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.bob-mainnet-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/bob-mainnet`)"                     
+      - "traefik.http.routers.bob-mainnet-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
+    networks:                                                                                         
+      - chains
+
+      
+  bob-mainnet-node:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545
+      - 7300
+      - 6060
+    ports:
+      - "15205:15205"
+      - "15205:15205/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
+    volumes:
+      - .jwtsecret:/jwtsecret
+    stop_grace_period: 30s
+    environment:
+      - "OP_NODE_NETWORK=bob-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://bob-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=15205"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15205"
+      - "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:  
+    bob-mainnet-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml b/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml
new file mode 100644
index 00000000..1bd047be
--- /dev/null
+++ b/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml
@@ -0,0 +1,95 @@
+services:
+  hashkeychain-mainnet:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545       
+      - 6060       
+    ports:
+      - "10579:10579"
+      - "10579:10579/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
+    stop_grace_period: 3m    
+    volumes:
+      - hashkeychain-mainnet-op-geth-pruned-pebble-path:/data
+      - .jwtsecret:/jwtsecret
+    environment:
+      - "GETH_DATADIR=/data"
+      - "GETH_OP_NETWORK=hashkeychain-mainnet"
+      - "GETH_GCMODE=full"
+      - "GETH_SYNCMODE=snap"
+      - "GETH_STATE_SCHEME=path"
+      - "GETH_DB_ENGINE=pebble"
+      - "GETH_NAT=extip:${IP}"
+      - "GETH_PORT=19809"
+      - "GETH_WS_PORT=8545"
+      - "GETH_HTTP_ADDR=0.0.0.0"
+      - "GETH_WS_ADDR=0.0.0.0"
+      - "GETH_HTTP_API=eth,net,debug,admin,web3"
+      - "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-stripprefix.stripprefix.prefixes=/hashkeychain-mainnet"                      
+      - "traefik.http.services.hashkeychain-mainnet-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.hashkeychain-mainnet-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.hashkeychain-mainnet-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.hashkeychain-mainnet-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/hashkeychain-mainnet`)"                     
+      - "traefik.http.routers.hashkeychain-mainnet-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
+    networks:                                                                                         
+      - chains
+
+      
+  hashkeychain-mainnet-node:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545
+      - 7300
+      - 6060
+    ports:
+      - "15579:15579"
+      - "15579:15579/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
+    volumes:
+      - .jwtsecret:/jwtsecret
+    stop_grace_period: 30s
+    environment:
+      - "OP_NODE_NETWORK=hashkeychain-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://hashkeychain-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=15579"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15579"
+      - "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:  
+    hashkeychain-mainnet-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/ink-mainnet-op-geth-pruned-pebble-path.yml b/ink-mainnet-op-geth-pruned-pebble-path.yml
index 45e3bdac..3b4f27c7 100644
--- a/ink-mainnet-op-geth-pruned-pebble-path.yml
+++ b/ink-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,16 +2,18 @@ services:
   ink-mainnet:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545       # RPC / Websocket      
-      - 19809     # P2P TCP (currently unused)
-      - 19809/udp # P2P UDP (currently unused)
-      - 6060       # metrics
+      - 8545       
+      - 6060       
     ports:
-      - "19809:19809"
-      - "19809:19809/udp"
-    command: [ "./geth" ]
-    restart: always
+      - "10395:10395"
+      - "10395:10395/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
     stop_grace_period: 3m    
     volumes:
       - ink-mainnet-op-geth-pruned-pebble-path:/data
@@ -34,12 +36,12 @@ services:
       - "GETH_AUTHRPC_VHOSTS=*"
     labels:                     
       - "traefik.enable=true"
-      - "traefik.http.middlewares.zora-stripprefix.stripprefix.prefixes=/ink-mainnet"                      
-      - "traefik.http.services.zora.loadbalancer.server.port=8545"
-      - "traefik.http.routers.zora.entrypoints=websecure"                                              
-      - "traefik.http.routers.zora.tls.certresolver=myresolver"                                        
-      - "traefik.http.routers.zora.rule=Host(`$DOMAIN`) && PathPrefix(`/ink-mainnet`)"                     
-      - "traefik.http.routers.zora.middlewares=zora-stripprefix, ipwhitelist"                           
+      - "traefik.http.middlewares.ink-mainnet-op-geth-stripprefix.stripprefix.prefixes=/ink-mainnet"                      
+      - "traefik.http.services.ink-mainnet-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.ink-mainnet-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.ink-mainnet-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.ink-mainnet-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/ink-mainnet`)"                     
+      - "traefik.http.routers.ink-mainnet-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
     networks:                                                                                         
       - chains
 
@@ -47,48 +49,47 @@ services:
   ink-mainnet-node:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545     # RPC
-      - 3306     # P2P TCP
-      - 3306/udp # P2P UDP
-      - 7300     # metrics
-      - 6060     # pprof
+      - 8545
+      - 7300
+      - 6060
     ports:
-      - "3306:3306"
-      - "3306:3306/udp"
-    command: [ "sh", "./op-node-entrypoint" ]
-    restart: always
+      - "15395:15395"
+      - "15395:15395/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
     volumes:
       - .jwtsecret:/jwtsecret
     stop_grace_period: 30s
     environment:
       - "OP_NODE_NETWORK=ink-mainnet"
       - "OP_NODE_SYNCMODE=execution-layer"
-      - "OP_NODE_L1_ETH_RPC=${INK_L1_ETHEREUM_MAINNET_EXECUTION_RPC}"
-      - "OP_NODE_L2_ENGINE_AUTH_RAW=${JWTSECRET}"
+      - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
       - "OP_NODE_L2_ENGINE_RPC=http://ink-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_STATIC=/ip4/35.230.102.175/tcp/9222/p2p/16Uiu2HAmSN33smB46ZtueBL2Hz1hsDy8tgSm1mqR38qAhwkX7ntd"
       - "OP_NODE_P2P_LISTEN_IP=0.0.0.0"
-      - "OP_NODE_P2P_LISTEN_TCP_PORT=3306"
-      - "OP_NODE_P2P_LISTEN_UDP_PORT=3306"
+      - "OP_NODE_P2P_LISTEN_TCP_PORT=15395"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15395"
       - "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_MAX_BATCH_SIZE=${ZORA_SEPOLIA_L1_BATCH_SIZE:-20}"
-      #- "OP_NODE_L1_RPC_RATE_LIMIT=${ZORA_SEPOLIA_L1_RATE_LIMIT:-30}"
-      - "OP_NODE_L1_RPC_KIND=${INK_L1_ETHEREUM_MAINNET_EXECUTION_KIND:-basic}"
-      - "OP_NODE_L1_TRUST_RPC=${INK_L1_ETHEREUM_MAINNET_EXECUTION_TRUST:-false}"
-      - "OP_NODE_L1_BEACON=${INK_L1_ETHEREUM_MAINNET_BEACON_REST}"
-      - "OP_NODE_L1_BEACON_ARCHIVER=${INK_L1_ETHEREUM_MAINNET_BEACON_ARCHIVER}"
+      - "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:  
-    ink-mainnet-op-geth-pruned-pebble-path:
+    ink-mainnet-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/ink-sepolia-op-geth-pruned-pebble-path.yml b/ink-sepolia-op-geth-pruned-pebble-path.yml
index 9593578b..05159b1d 100644
--- a/ink-sepolia-op-geth-pruned-pebble-path.yml
+++ b/ink-sepolia-op-geth-pruned-pebble-path.yml
@@ -2,16 +2,18 @@ services:
   ink-sepolia:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545       # RPC / Websocket      
-      - 19809     # P2P TCP (currently unused)
-      - 19809/udp # P2P UDP (currently unused)
-      - 6060       # metrics
+      - 8545       
+      - 6060       
     ports:
-      - "19809:19809"
-      - "19809:19809/udp"
-    command: [ "./geth" ]
-    restart: always
+      - "10829:10829"
+      - "10829:10829/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
     stop_grace_period: 3m    
     volumes:
       - ink-sepolia-op-geth-pruned-pebble-path:/data
@@ -34,12 +36,12 @@ services:
       - "GETH_AUTHRPC_VHOSTS=*"
     labels:                     
       - "traefik.enable=true"
-      - "traefik.http.middlewares.zora-stripprefix.stripprefix.prefixes=/ink-sepolia"                      
-      - "traefik.http.services.zora.loadbalancer.server.port=8545"
-      - "traefik.http.routers.zora.entrypoints=websecure"                                              
-      - "traefik.http.routers.zora.tls.certresolver=myresolver"                                        
-      - "traefik.http.routers.zora.rule=Host(`$DOMAIN`) && PathPrefix(`/ink-sepolia`)"                     
-      - "traefik.http.routers.zora.middlewares=zora-stripprefix, ipwhitelist"                           
+      - "traefik.http.middlewares.ink-sepolia-op-geth-stripprefix.stripprefix.prefixes=/ink-sepolia"                      
+      - "traefik.http.services.ink-sepolia-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.ink-sepolia-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.ink-sepolia-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.ink-sepolia-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/ink-sepolia`)"                     
+      - "traefik.http.routers.ink-sepolia-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
     networks:                                                                                         
       - chains
 
@@ -47,48 +49,47 @@ services:
   ink-sepolia-node:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545     # RPC
-      - 3306     # P2P TCP
-      - 3306/udp # P2P UDP
-      - 7300     # metrics
-      - 6060     # pprof
+      - 8545
+      - 7300
+      - 6060
     ports:
-      - "3306:3306"
-      - "3306:3306/udp"
-    command: [ "sh", "./op-node-entrypoint" ]
-    restart: always
+      - "15829:15829"
+      - "15829:15829/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
     volumes:
       - .jwtsecret:/jwtsecret
     stop_grace_period: 30s
     environment:
       - "OP_NODE_NETWORK=ink-sepolia"
       - "OP_NODE_SYNCMODE=execution-layer"
-      - "OP_NODE_L1_ETH_RPC=${INK_L1_ETHEREUM_SEPOLIA_EXECUTION_RPC}"
-      - "OP_NODE_L2_ENGINE_AUTH_RAW=${JWTSECRET}"
+      - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
       - "OP_NODE_L2_ENGINE_RPC=http://ink-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_STATIC=/ip4/35.230.102.175/tcp/9222/p2p/16Uiu2HAmSN33smB46ZtueBL2Hz1hsDy8tgSm1mqR38qAhwkX7ntd"
       - "OP_NODE_P2P_LISTEN_IP=0.0.0.0"
-      - "OP_NODE_P2P_LISTEN_TCP_PORT=3306"
-      - "OP_NODE_P2P_LISTEN_UDP_PORT=3306"
+      - "OP_NODE_P2P_LISTEN_TCP_PORT=15829"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15829"
       - "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_MAX_BATCH_SIZE=${ZORA_SEPOLIA_L1_BATCH_SIZE:-20}"
-      #- "OP_NODE_L1_RPC_RATE_LIMIT=${ZORA_SEPOLIA_L1_RATE_LIMIT:-30}"
-      - "OP_NODE_L1_RPC_KIND=${INK_L1_ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}"
-      - "OP_NODE_L1_TRUST_RPC=${INK_L1_ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}"
-      - "OP_NODE_L1_BEACON=${INK_L1_ETHEREUM_SEPOLIA_BEACON_REST}"
-      - "OP_NODE_L1_BEACON_ARCHIVER=${INK_L1_ETHEREUM_SEPOLIA_BEACON_ARCHIVER}"
+      - "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:  
-    ink-sepolia-op-geth-pruned-pebble-path:
+    ink-sepolia-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/lisk-mainnet-op-geth-pruned-pebble-path.yml b/lisk-mainnet-op-geth-pruned-pebble-path.yml
new file mode 100644
index 00000000..14d093f4
--- /dev/null
+++ b/lisk-mainnet-op-geth-pruned-pebble-path.yml
@@ -0,0 +1,95 @@
+services:
+  lisk-mainnet:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545       
+      - 6060       
+    ports:
+      - "10295:10295"
+      - "10295:10295/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
+    stop_grace_period: 3m    
+    volumes:
+      - lisk-mainnet-op-geth-pruned-pebble-path:/data
+      - .jwtsecret:/jwtsecret
+    environment:
+      - "GETH_DATADIR=/data"
+      - "GETH_OP_NETWORK=lisk-mainnet"
+      - "GETH_GCMODE=full"
+      - "GETH_SYNCMODE=snap"
+      - "GETH_STATE_SCHEME=path"
+      - "GETH_DB_ENGINE=pebble"
+      - "GETH_NAT=extip:${IP}"
+      - "GETH_PORT=19809"
+      - "GETH_WS_PORT=8545"
+      - "GETH_HTTP_ADDR=0.0.0.0"
+      - "GETH_WS_ADDR=0.0.0.0"
+      - "GETH_HTTP_API=eth,net,debug,admin,web3"
+      - "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-stripprefix.stripprefix.prefixes=/lisk-mainnet"                      
+      - "traefik.http.services.lisk-mainnet-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.lisk-mainnet-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.lisk-mainnet-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.lisk-mainnet-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/lisk-mainnet`)"                     
+      - "traefik.http.routers.lisk-mainnet-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
+    networks:                                                                                         
+      - chains
+
+      
+  lisk-mainnet-node:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545
+      - 7300
+      - 6060
+    ports:
+      - "15295:15295"
+      - "15295:15295/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
+    volumes:
+      - .jwtsecret:/jwtsecret
+    stop_grace_period: 30s
+    environment:
+      - "OP_NODE_NETWORK=lisk-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://lisk-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=15295"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15295"
+      - "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:  
+    lisk-mainnet-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/lisk-sepolia-op-geth-pruned-pebble-path.yml b/lisk-sepolia-op-geth-pruned-pebble-path.yml
new file mode 100644
index 00000000..81aa1f87
--- /dev/null
+++ b/lisk-sepolia-op-geth-pruned-pebble-path.yml
@@ -0,0 +1,95 @@
+services:
+  lisk-sepolia:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: v1.12.1
+         GETH_VERSION: v1.101503.1
+         OP_PATCH: sepolia/lisk/op-node.patch
+    expose:
+      - 8545       
+      - 6060       
+    ports:
+      - "10063:10063"
+      - "10063:10063/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
+    stop_grace_period: 3m    
+    volumes:
+      - lisk-sepolia-op-geth-pruned-pebble-path:/data
+      - .jwtsecret:/jwtsecret
+    environment:
+      - "GETH_DATADIR=/data"
+      - "GETH_OP_NETWORK=lisk-sepolia"
+      - "GETH_GCMODE=full"
+      - "GETH_SYNCMODE=snap"
+      - "GETH_STATE_SCHEME=path"
+      - "GETH_DB_ENGINE=pebble"
+      - "GETH_NAT=extip:${IP}"
+      - "GETH_PORT=19809"
+      - "GETH_WS_PORT=8545"
+      - "GETH_HTTP_ADDR=0.0.0.0"
+      - "GETH_WS_ADDR=0.0.0.0"
+      - "GETH_HTTP_API=eth,net,debug,admin,web3"
+      - "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-stripprefix.stripprefix.prefixes=/lisk-sepolia"                      
+      - "traefik.http.services.lisk-sepolia-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.lisk-sepolia-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.lisk-sepolia-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.lisk-sepolia-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/lisk-sepolia`)"                     
+      - "traefik.http.routers.lisk-sepolia-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
+    networks:                                                                                         
+      - chains
+
+      
+  lisk-sepolia-node:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: v1.12.1
+         GETH_VERSION: v1.101503.1
+         OP_PATCH: sepolia/lisk/op-node.patch
+    expose:
+      - 8545
+      - 7300
+      - 6060
+    ports:
+      - "15063:15063"
+      - "15063:15063/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
+    volumes:
+      - .jwtsecret:/jwtsecret
+    stop_grace_period: 30s
+    environment:
+      - "OP_NODE_NETWORK=lisk-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://lisk-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=15063"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15063"
+      - "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:  
+    lisk-sepolia-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/metal-mainnet-op-geth-pruned-pebble-path.yml b/metal-mainnet-op-geth-pruned-pebble-path.yml
new file mode 100644
index 00000000..600de894
--- /dev/null
+++ b/metal-mainnet-op-geth-pruned-pebble-path.yml
@@ -0,0 +1,95 @@
+services:
+  metal-mainnet:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545       
+      - 6060       
+    ports:
+      - "10221:10221"
+      - "10221:10221/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
+    stop_grace_period: 3m    
+    volumes:
+      - metal-mainnet-op-geth-pruned-pebble-path:/data
+      - .jwtsecret:/jwtsecret
+    environment:
+      - "GETH_DATADIR=/data"
+      - "GETH_OP_NETWORK=metal-mainnet"
+      - "GETH_GCMODE=full"
+      - "GETH_SYNCMODE=snap"
+      - "GETH_STATE_SCHEME=path"
+      - "GETH_DB_ENGINE=pebble"
+      - "GETH_NAT=extip:${IP}"
+      - "GETH_PORT=19809"
+      - "GETH_WS_PORT=8545"
+      - "GETH_HTTP_ADDR=0.0.0.0"
+      - "GETH_WS_ADDR=0.0.0.0"
+      - "GETH_HTTP_API=eth,net,debug,admin,web3"
+      - "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-stripprefix.stripprefix.prefixes=/metal-mainnet"                      
+      - "traefik.http.services.metal-mainnet-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.metal-mainnet-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.metal-mainnet-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.metal-mainnet-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/metal-mainnet`)"                     
+      - "traefik.http.routers.metal-mainnet-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
+    networks:                                                                                         
+      - chains
+
+      
+  metal-mainnet-node:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545
+      - 7300
+      - 6060
+    ports:
+      - "15221:15221"
+      - "15221:15221/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
+    volumes:
+      - .jwtsecret:/jwtsecret
+    stop_grace_period: 30s
+    environment:
+      - "OP_NODE_NETWORK=metal-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://metal-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=15221"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15221"
+      - "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:  
+    metal-mainnet-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/metal-sepolia-op-geth-pruned-pebble-path.yml b/metal-sepolia-op-geth-pruned-pebble-path.yml
new file mode 100644
index 00000000..b3c77495
--- /dev/null
+++ b/metal-sepolia-op-geth-pruned-pebble-path.yml
@@ -0,0 +1,95 @@
+services:
+  metal-sepolia:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545       
+      - 6060       
+    ports:
+      - "10439:10439"
+      - "10439:10439/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
+    stop_grace_period: 3m    
+    volumes:
+      - metal-sepolia-op-geth-pruned-pebble-path:/data
+      - .jwtsecret:/jwtsecret
+    environment:
+      - "GETH_DATADIR=/data"
+      - "GETH_OP_NETWORK=metal-sepolia"
+      - "GETH_GCMODE=full"
+      - "GETH_SYNCMODE=snap"
+      - "GETH_STATE_SCHEME=path"
+      - "GETH_DB_ENGINE=pebble"
+      - "GETH_NAT=extip:${IP}"
+      - "GETH_PORT=19809"
+      - "GETH_WS_PORT=8545"
+      - "GETH_HTTP_ADDR=0.0.0.0"
+      - "GETH_WS_ADDR=0.0.0.0"
+      - "GETH_HTTP_API=eth,net,debug,admin,web3"
+      - "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-stripprefix.stripprefix.prefixes=/metal-sepolia"                      
+      - "traefik.http.services.metal-sepolia-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.metal-sepolia-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.metal-sepolia-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.metal-sepolia-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/metal-sepolia`)"                     
+      - "traefik.http.routers.metal-sepolia-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
+    networks:                                                                                         
+      - chains
+
+      
+  metal-sepolia-node:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545
+      - 7300
+      - 6060
+    ports:
+      - "15439:15439"
+      - "15439:15439/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
+    volumes:
+      - .jwtsecret:/jwtsecret
+    stop_grace_period: 30s
+    environment:
+      - "OP_NODE_NETWORK=metal-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://metal-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=15439"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15439"
+      - "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:  
+    metal-sepolia-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/mode-mainnet-op-geth-pruned-pebble-path.yml b/mode-mainnet-op-geth-pruned-pebble-path.yml
index 28170969..026f3463 100644
--- a/mode-mainnet-op-geth-pruned-pebble-path.yml
+++ b/mode-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,16 +2,18 @@ services:
   mode-mainnet:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545       # RPC / Websocket      
-      - 19809     # P2P TCP (currently unused)
-      - 19809/udp # P2P UDP (currently unused)
-      - 6060       # metrics
+      - 8545       
+      - 6060       
     ports:
-      - "19809:19809"
-      - "19809:19809/udp"
-    command: [ "./geth" ]
-    restart: always
+      - "10182:10182"
+      - "10182:10182/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
     stop_grace_period: 3m    
     volumes:
       - mode-mainnet-op-geth-pruned-pebble-path:/data
@@ -34,12 +36,12 @@ services:
       - "GETH_AUTHRPC_VHOSTS=*"
     labels:                     
       - "traefik.enable=true"
-      - "traefik.http.middlewares.mode-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/mode-mainnet"                      
-      - "traefik.http.services.mode-mainnet-op-geth-pruned-pebble-path.loadbalancer.server.port=8545"
-      - "traefik.http.routers.mode-mainnet-op-geth-pruned-pebble-path.entrypoints=websecure"                                              
-      - "traefik.http.routers.mode-mainnet-op-geth-pruned-pebble-path.tls.certresolver=myresolver"                                        
-      - "traefik.http.routers.mode-mainnet-op-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && PathPrefix(`/mode-mainnet`)"                     
-      - "traefik.http.routers.mode-mainnet-op-geth-pruned-pebble-path.middlewares=mode-mainnet-op-geth-pruned-pebble-path-stripprefix, ipwhitelist"                           
+      - "traefik.http.middlewares.mode-mainnet-op-geth-stripprefix.stripprefix.prefixes=/mode-mainnet"                      
+      - "traefik.http.services.mode-mainnet-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.mode-mainnet-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.mode-mainnet-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.mode-mainnet-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/mode-mainnet`)"                     
+      - "traefik.http.routers.mode-mainnet-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
     networks:                                                                                         
       - chains
 
@@ -47,48 +49,47 @@ services:
   mode-mainnet-node:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545     # RPC
-      - 3306     # P2P TCP
-      - 3306/udp # P2P UDP
-      - 7300     # metrics
-      - 6060     # pprof
+      - 8545
+      - 7300
+      - 6060
     ports:
-      - "3306:3306"
-      - "3306:3306/udp"
-    command: [ "sh", "./op-node-entrypoint" ]
-    restart: always
+      - "15182:15182"
+      - "15182:15182/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
     volumes:
       - .jwtsecret:/jwtsecret
     stop_grace_period: 30s
     environment:
       - "OP_NODE_NETWORK=mode-mainnet"
       - "OP_NODE_SYNCMODE=execution-layer"
-      - "OP_NODE_L1_ETH_RPC=${UNICHAIN_L1_ETHEREUM_SEPOLIA_EXECUTION_RPC}"
-      - "OP_NODE_L2_ENGINE_AUTH_RAW=${JWTSECRET}"
+      - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
       - "OP_NODE_L2_ENGINE_RPC=http://mode-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_STATIC=/ip4/35.230.102.175/tcp/9222/p2p/16Uiu2HAmSN33smB46ZtueBL2Hz1hsDy8tgSm1mqR38qAhwkX7ntd"
       - "OP_NODE_P2P_LISTEN_IP=0.0.0.0"
-      - "OP_NODE_P2P_LISTEN_TCP_PORT=3306"
-      - "OP_NODE_P2P_LISTEN_UDP_PORT=3306"
+      - "OP_NODE_P2P_LISTEN_TCP_PORT=15182"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15182"
       - "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_MAX_BATCH_SIZE=${UNICHAIN_SEPOLIA_L1_BATCH_SIZE:-20}"
-      #- "OP_NODE_L1_RPC_RATE_LIMIT=${UNICHAIN_SEPOLIA_L1_RATE_LIMIT:-30}"
-      - "OP_NODE_L1_RPC_KIND=${UNICHAIN_L1_ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}"
-      - "OP_NODE_L1_TRUST_RPC=${UNICHAIN_L1_ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}"
-      - "OP_NODE_L1_BEACON=${UNICHAIN_L1_ETHEREUM_SEPOLIA_BEACON_REST}"
-      - "OP_NODE_L1_BEACON_ARCHIVER=${UNICHAIN_L1_ETHEREUM_SEPOLIA_BEACON_ARCHIVER}"
+      - "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:  
-    mode-mainnet-op-geth-pruned-pebble-path:
+    mode-mainnet-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/mode-sepolia-op-geth-pruned-pebble-path.yml b/mode-sepolia-op-geth-pruned-pebble-path.yml
index 8bf7016e..26f8700a 100644
--- a/mode-sepolia-op-geth-pruned-pebble-path.yml
+++ b/mode-sepolia-op-geth-pruned-pebble-path.yml
@@ -2,16 +2,18 @@ services:
   mode-sepolia:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545       # RPC / Websocket      
-      - 19809     # P2P TCP (currently unused)
-      - 19809/udp # P2P UDP (currently unused)
-      - 6060       # metrics
+      - 8545       
+      - 6060       
     ports:
-      - "19809:19809"
-      - "19809:19809/udp"
-    command: [ "./geth" ]
-    restart: always
+      - "10513:10513"
+      - "10513:10513/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
     stop_grace_period: 3m    
     volumes:
       - mode-sepolia-op-geth-pruned-pebble-path:/data
@@ -34,12 +36,12 @@ services:
       - "GETH_AUTHRPC_VHOSTS=*"
     labels:                     
       - "traefik.enable=true"
-      - "traefik.http.middlewares.mode-sepolia-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/mode-sepolia"                      
-      - "traefik.http.services.mode-sepolia-op-geth-pruned-pebble-path.loadbalancer.server.port=8545"
-      - "traefik.http.routers.mode-sepolia-op-geth-pruned-pebble-path.entrypoints=websecure"                                              
-      - "traefik.http.routers.mode-sepolia-op-geth-pruned-pebble-path.tls.certresolver=myresolver"                                        
-      - "traefik.http.routers.mode-sepolia-op-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && PathPrefix(`/mode-sepolia`)"                     
-      - "traefik.http.routers.mode-sepolia-op-geth-pruned-pebble-path.middlewares=mode-sepolia-op-geth-pruned-pebble-path-stripprefix, ipwhitelist"                           
+      - "traefik.http.middlewares.mode-sepolia-op-geth-stripprefix.stripprefix.prefixes=/mode-sepolia"                      
+      - "traefik.http.services.mode-sepolia-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.mode-sepolia-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.mode-sepolia-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.mode-sepolia-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/mode-sepolia`)"                     
+      - "traefik.http.routers.mode-sepolia-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
     networks:                                                                                         
       - chains
 
@@ -47,48 +49,47 @@ services:
   mode-sepolia-node:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545     # RPC
-      - 3306     # P2P TCP
-      - 3306/udp # P2P UDP
-      - 7300     # metrics
-      - 6060     # pprof
+      - 8545
+      - 7300
+      - 6060
     ports:
-      - "3306:3306"
-      - "3306:3306/udp"
-    command: [ "sh", "./op-node-entrypoint" ]
-    restart: always
+      - "15513:15513"
+      - "15513:15513/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
     volumes:
       - .jwtsecret:/jwtsecret
     stop_grace_period: 30s
     environment:
       - "OP_NODE_NETWORK=mode-sepolia"
       - "OP_NODE_SYNCMODE=execution-layer"
-      - "OP_NODE_L1_ETH_RPC=${UNICHAIN_L1_ETHEREUM_SEPOLIA_EXECUTION_RPC}"
-      - "OP_NODE_L2_ENGINE_AUTH_RAW=${JWTSECRET}"
+      - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
       - "OP_NODE_L2_ENGINE_RPC=http://mode-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_STATIC=/ip4/35.230.102.175/tcp/9222/p2p/16Uiu2HAmSN33smB46ZtueBL2Hz1hsDy8tgSm1mqR38qAhwkX7ntd"
       - "OP_NODE_P2P_LISTEN_IP=0.0.0.0"
-      - "OP_NODE_P2P_LISTEN_TCP_PORT=3306"
-      - "OP_NODE_P2P_LISTEN_UDP_PORT=3306"
+      - "OP_NODE_P2P_LISTEN_TCP_PORT=15513"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15513"
       - "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_MAX_BATCH_SIZE=${UNICHAIN_SEPOLIA_L1_BATCH_SIZE:-20}"
-      #- "OP_NODE_L1_RPC_RATE_LIMIT=${UNICHAIN_SEPOLIA_L1_RATE_LIMIT:-30}"
-      - "OP_NODE_L1_RPC_KIND=${UNICHAIN_L1_ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}"
-      - "OP_NODE_L1_TRUST_RPC=${UNICHAIN_L1_ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}"
-      - "OP_NODE_L1_BEACON=${UNICHAIN_L1_ETHEREUM_SEPOLIA_BEACON_REST}"
-      - "OP_NODE_L1_BEACON_ARCHIVER=${UNICHAIN_L1_ETHEREUM_SEPOLIA_BEACON_ARCHIVER}"
+      - "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:  
-    mode-sepolia-op-geth-pruned-pebble-path:
+    mode-sepolia-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/op-mainnet-op-geth-pruned-pebble-path.yml b/op-mainnet-op-geth-pruned-pebble-path.yml
new file mode 100644
index 00000000..80ac9e46
--- /dev/null
+++ b/op-mainnet-op-geth-pruned-pebble-path.yml
@@ -0,0 +1,95 @@
+services:
+  op-mainnet:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545       
+      - 6060       
+    ports:
+      - "10575:10575"
+      - "10575:10575/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
+    stop_grace_period: 3m    
+    volumes:
+      - op-mainnet-op-geth-pruned-pebble-path:/data
+      - .jwtsecret:/jwtsecret
+    environment:
+      - "GETH_DATADIR=/data"
+      - "GETH_OP_NETWORK=op-mainnet"
+      - "GETH_GCMODE=full"
+      - "GETH_SYNCMODE=snap"
+      - "GETH_STATE_SCHEME=path"
+      - "GETH_DB_ENGINE=pebble"
+      - "GETH_NAT=extip:${IP}"
+      - "GETH_PORT=19809"
+      - "GETH_WS_PORT=8545"
+      - "GETH_HTTP_ADDR=0.0.0.0"
+      - "GETH_WS_ADDR=0.0.0.0"
+      - "GETH_HTTP_API=eth,net,debug,admin,web3"
+      - "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-stripprefix.stripprefix.prefixes=/op-mainnet"                      
+      - "traefik.http.services.op-mainnet-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.op-mainnet-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.op-mainnet-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.op-mainnet-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/op-mainnet`)"                     
+      - "traefik.http.routers.op-mainnet-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
+    networks:                                                                                         
+      - chains
+
+      
+  op-mainnet-node:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545
+      - 7300
+      - 6060
+    ports:
+      - "15575:15575"
+      - "15575:15575/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
+    volumes:
+      - .jwtsecret:/jwtsecret
+    stop_grace_period: 30s
+    environment:
+      - "OP_NODE_NETWORK=op-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://op-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=15575"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15575"
+      - "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:  
+    op-mainnet-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/op-sepolia-op-geth-pruned-pebble-path.yml b/op-sepolia-op-geth-pruned-pebble-path.yml
new file mode 100644
index 00000000..6f9202ac
--- /dev/null
+++ b/op-sepolia-op-geth-pruned-pebble-path.yml
@@ -0,0 +1,95 @@
+services:
+  op-sepolia:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545       
+      - 6060       
+    ports:
+      - "10704:10704"
+      - "10704:10704/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
+    stop_grace_period: 3m    
+    volumes:
+      - op-sepolia-op-geth-pruned-pebble-path:/data
+      - .jwtsecret:/jwtsecret
+    environment:
+      - "GETH_DATADIR=/data"
+      - "GETH_OP_NETWORK=op-sepolia"
+      - "GETH_GCMODE=full"
+      - "GETH_SYNCMODE=snap"
+      - "GETH_STATE_SCHEME=path"
+      - "GETH_DB_ENGINE=pebble"
+      - "GETH_NAT=extip:${IP}"
+      - "GETH_PORT=19809"
+      - "GETH_WS_PORT=8545"
+      - "GETH_HTTP_ADDR=0.0.0.0"
+      - "GETH_WS_ADDR=0.0.0.0"
+      - "GETH_HTTP_API=eth,net,debug,admin,web3"
+      - "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-stripprefix.stripprefix.prefixes=/op-sepolia"                      
+      - "traefik.http.services.op-sepolia-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.op-sepolia-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.op-sepolia-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.op-sepolia-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/op-sepolia`)"                     
+      - "traefik.http.routers.op-sepolia-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
+    networks:                                                                                         
+      - chains
+
+      
+  op-sepolia-node:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545
+      - 7300
+      - 6060
+    ports:
+      - "15704:15704"
+      - "15704:15704/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
+    volumes:
+      - .jwtsecret:/jwtsecret
+    stop_grace_period: 30s
+    environment:
+      - "OP_NODE_NETWORK=op-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://op-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=15704"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15704"
+      - "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:  
+    op-sepolia-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/snax-mainnet-op-geth-pruned-pebble-path.yml b/snax-mainnet-op-geth-pruned-pebble-path.yml
index 4cd174e3..3e02b565 100644
--- a/snax-mainnet-op-geth-pruned-pebble-path.yml
+++ b/snax-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,16 +2,18 @@ services:
   snax-mainnet:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545       # RPC / Websocket      
-      - 19809     # P2P TCP (currently unused)
-      - 19809/udp # P2P UDP (currently unused)
-      - 6060       # metrics
+      - 8545       
+      - 6060       
     ports:
-      - "19809:19809"
-      - "19809:19809/udp"
-    command: [ "./geth" ]
-    restart: always
+      - "10681:10681"
+      - "10681:10681/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
     stop_grace_period: 3m    
     volumes:
       - snax-mainnet-op-geth-pruned-pebble-path:/data
@@ -34,12 +36,12 @@ services:
       - "GETH_AUTHRPC_VHOSTS=*"
     labels:                     
       - "traefik.enable=true"
-      - "traefik.http.middlewares.snax-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/snax-mainnet"                      
-      - "traefik.http.services.snax-mainnet-op-geth-pruned-pebble-path.loadbalancer.server.port=8545"
-      - "traefik.http.routers.snax-mainnet-op-geth-pruned-pebble-path.entrypoints=websecure"                                              
-      - "traefik.http.routers.snax-mainnet-op-geth-pruned-pebble-path.tls.certresolver=myresolver"                                        
-      - "traefik.http.routers.snax-mainnet-op-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && PathPrefix(`/snax-mainnet`)"                     
-      - "traefik.http.routers.snax-mainnet-op-geth-pruned-pebble-path.middlewares=snax-mainnet-op-geth-pruned-pebble-path-stripprefix, ipwhitelist"                           
+      - "traefik.http.middlewares.snax-mainnet-op-geth-stripprefix.stripprefix.prefixes=/snax-mainnet"                      
+      - "traefik.http.services.snax-mainnet-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.snax-mainnet-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.snax-mainnet-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.snax-mainnet-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/snax-mainnet`)"                     
+      - "traefik.http.routers.snax-mainnet-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
     networks:                                                                                         
       - chains
 
@@ -47,48 +49,47 @@ services:
   snax-mainnet-node:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545     # RPC
-      - 3306     # P2P TCP
-      - 3306/udp # P2P UDP
-      - 7300     # metrics
-      - 6060     # pprof
+      - 8545
+      - 7300
+      - 6060
     ports:
-      - "3306:3306"
-      - "3306:3306/udp"
-    command: [ "sh", "./op-node-entrypoint" ]
-    restart: always
+      - "15681:15681"
+      - "15681:15681/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
     volumes:
       - .jwtsecret:/jwtsecret
     stop_grace_period: 30s
     environment:
       - "OP_NODE_NETWORK=snax-mainnet"
       - "OP_NODE_SYNCMODE=execution-layer"
-      - "OP_NODE_L1_ETH_RPC=${SNAX_L1_ETHEREUM_MAINNET_EXECUTION_RPC}"
-      - "OP_NODE_L2_ENGINE_AUTH_RAW=${JWTSECRET}"
+      - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
       - "OP_NODE_L2_ENGINE_RPC=http://snax-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_STATIC=/ip4/35.230.102.175/tcp/9222/p2p/16Uiu2HAmSN33smB46ZtueBL2Hz1hsDy8tgSm1mqR38qAhwkX7ntd"
       - "OP_NODE_P2P_LISTEN_IP=0.0.0.0"
-      - "OP_NODE_P2P_LISTEN_TCP_PORT=3306"
-      - "OP_NODE_P2P_LISTEN_UDP_PORT=3306"
+      - "OP_NODE_P2P_LISTEN_TCP_PORT=15681"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15681"
       - "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_MAX_BATCH_SIZE=${SNAX_MAINNET_L1_BATCH_SIZE:-20}"
-      #- "OP_NODE_L1_RPC_RATE_LIMIT=${SNAX_MAINNET_L1_RATE_LIMIT:-30}"
-      - "OP_NODE_L1_RPC_KIND=${SNAX_L1_ETHEREUM_MAINNET_EXECUTION_KIND:-basic}"
-      - "OP_NODE_L1_TRUST_RPC=${SNAX_L1_ETHEREUM_MAINNET_EXECUTION_TRUST:-false}"
-      - "OP_NODE_L1_BEACON=${SNAX_L1_ETHEREUM_MAINNET_BEACON_REST}"
-      - "OP_NODE_L1_BEACON_ARCHIVER=${SNAX_L1_ETHEREUM_MAINNET_BEACON_ARCHIVER}"
+      - "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:  
-    snax-mainnet-op-geth-pruned-pebble-path:
+    snax-mainnet-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/swell-mainnet-op-geth-pruned-pebble-path.yml b/swell-mainnet-op-geth-pruned-pebble-path.yml
new file mode 100644
index 00000000..ae02b035
--- /dev/null
+++ b/swell-mainnet-op-geth-pruned-pebble-path.yml
@@ -0,0 +1,95 @@
+services:
+  swell-mainnet:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545       
+      - 6060       
+    ports:
+      - "10649:10649"
+      - "10649:10649/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
+    stop_grace_period: 3m    
+    volumes:
+      - swell-mainnet-op-geth-pruned-pebble-path:/data
+      - .jwtsecret:/jwtsecret
+    environment:
+      - "GETH_DATADIR=/data"
+      - "GETH_OP_NETWORK=swell-mainnet"
+      - "GETH_GCMODE=full"
+      - "GETH_SYNCMODE=snap"
+      - "GETH_STATE_SCHEME=path"
+      - "GETH_DB_ENGINE=pebble"
+      - "GETH_NAT=extip:${IP}"
+      - "GETH_PORT=19809"
+      - "GETH_WS_PORT=8545"
+      - "GETH_HTTP_ADDR=0.0.0.0"
+      - "GETH_WS_ADDR=0.0.0.0"
+      - "GETH_HTTP_API=eth,net,debug,admin,web3"
+      - "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-stripprefix.stripprefix.prefixes=/swell-mainnet"                      
+      - "traefik.http.services.swell-mainnet-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.swell-mainnet-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.swell-mainnet-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.swell-mainnet-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/swell-mainnet`)"                     
+      - "traefik.http.routers.swell-mainnet-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
+    networks:                                                                                         
+      - chains
+
+      
+  swell-mainnet-node:
+    build:
+      context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
+    expose:
+      - 8545
+      - 7300
+      - 6060
+    ports:
+      - "15649:15649"
+      - "15649:15649/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
+    volumes:
+      - .jwtsecret:/jwtsecret
+    stop_grace_period: 30s
+    environment:
+      - "OP_NODE_NETWORK=swell-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://swell-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=15649"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15649"
+      - "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:  
+    swell-mainnet-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/unichain-mainnet-op-geth-pruned-pebble-path.yml b/unichain-mainnet-op-geth-pruned-pebble-path.yml
index 8eb6fd32..e4e91b96 100644
--- a/unichain-mainnet-op-geth-pruned-pebble-path.yml
+++ b/unichain-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,16 +2,18 @@ services:
   unichain-mainnet:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545       # RPC / Websocket      
-      - 19809     # P2P TCP (currently unused)
-      - 19809/udp # P2P UDP (currently unused)
-      - 6060       # metrics
+      - 8545       
+      - 6060       
     ports:
-      - "19809:19809"
-      - "19809:19809/udp"
-    command: [ "./geth" ]
-    restart: always
+      - "10248:10248"
+      - "10248:10248/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
     stop_grace_period: 3m    
     volumes:
       - unichain-mainnet-op-geth-pruned-pebble-path:/data
@@ -34,12 +36,12 @@ services:
       - "GETH_AUTHRPC_VHOSTS=*"
     labels:                     
       - "traefik.enable=true"
-      - "traefik.http.middlewares.unichain-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/unichain-mainnet"                      
-      - "traefik.http.services.unichain-mainnet-op-geth-pruned-pebble-path.loadbalancer.server.port=8545"
-      - "traefik.http.routers.unichain-mainnet-op-geth-pruned-pebble-path.entrypoints=websecure"                                              
-      - "traefik.http.routers.unichain-mainnet-op-geth-pruned-pebble-path.tls.certresolver=myresolver"                                        
-      - "traefik.http.routers.unichain-mainnet-op-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && PathPrefix(`/unichain-mainnet`)"                     
-      - "traefik.http.routers.unichain-mainnet-op-geth-pruned-pebble-path.middlewares=unichain-mainnet-op-geth-pruned-pebble-path-stripprefix, ipwhitelist"                           
+      - "traefik.http.middlewares.unichain-mainnet-op-geth-stripprefix.stripprefix.prefixes=/unichain-mainnet"                      
+      - "traefik.http.services.unichain-mainnet-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.unichain-mainnet-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.unichain-mainnet-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.unichain-mainnet-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/unichain-mainnet`)"                     
+      - "traefik.http.routers.unichain-mainnet-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
     networks:                                                                                         
       - chains
 
@@ -47,48 +49,47 @@ services:
   unichain-mainnet-node:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545     # RPC
-      - 3306     # P2P TCP
-      - 3306/udp # P2P UDP
-      - 7300     # metrics
-      - 6060     # pprof
+      - 8545
+      - 7300
+      - 6060
     ports:
-      - "3306:3306"
-      - "3306:3306/udp"
-    command: [ "sh", "./op-node-entrypoint" ]
-    restart: always
+      - "15248:15248"
+      - "15248:15248/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
     volumes:
       - .jwtsecret:/jwtsecret
     stop_grace_period: 30s
     environment:
       - "OP_NODE_NETWORK=unichain-mainnet"
       - "OP_NODE_SYNCMODE=execution-layer"
-      - "OP_NODE_L1_ETH_RPC=${UNICHAIN_L1_ETHEREUM_MAINNET_EXECUTION_RPC}"
-      - "OP_NODE_L2_ENGINE_AUTH_RAW=${JWTSECRET}"
+      - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
       - "OP_NODE_L2_ENGINE_RPC=http://unichain-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_STATIC=/ip4/35.230.102.175/tcp/9222/p2p/16Uiu2HAmSN33smB46ZtueBL2Hz1hsDy8tgSm1mqR38qAhwkX7ntd"
       - "OP_NODE_P2P_LISTEN_IP=0.0.0.0"
-      - "OP_NODE_P2P_LISTEN_TCP_PORT=3306"
-      - "OP_NODE_P2P_LISTEN_UDP_PORT=3306"
+      - "OP_NODE_P2P_LISTEN_TCP_PORT=15248"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15248"
       - "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_MAX_BATCH_SIZE=${UNICHAIN_MAINNET_L1_BATCH_SIZE:-20}"
-      #- "OP_NODE_L1_RPC_RATE_LIMIT=${UNICHAIN_MAINNET_L1_RATE_LIMIT:-30}"
-      - "OP_NODE_L1_RPC_KIND=${UNICHAIN_L1_ETHEREUM_MAINNET_EXECUTION_KIND:-basic}"
-      - "OP_NODE_L1_TRUST_RPC=${UNICHAIN_L1_ETHEREUM_MAINNET_EXECUTION_TRUST:-false}"
-      - "OP_NODE_L1_BEACON=${UNICHAIN_L1_ETHEREUM_MAINNET_BEACON_REST}"
-      - "OP_NODE_L1_BEACON_ARCHIVER=${UNICHAIN_L1_ETHEREUM_MAINNET_BEACON_ARCHIVER}"
+      - "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:  
-    unichain-mainnet-op-geth-pruned-pebble-path:
+    unichain-mainnet-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/unichain-sepolia-op-geth-pruned-pebble-path.yml b/unichain-sepolia-op-geth-pruned-pebble-path.yml
index bdb5d18a..312e348a 100644
--- a/unichain-sepolia-op-geth-pruned-pebble-path.yml
+++ b/unichain-sepolia-op-geth-pruned-pebble-path.yml
@@ -2,16 +2,18 @@ services:
   unichain-sepolia:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545       # RPC / Websocket      
-      - 19809     # P2P TCP (currently unused)
-      - 19809/udp # P2P UDP (currently unused)
-      - 6060       # metrics
+      - 8545       
+      - 6060       
     ports:
-      - "19809:19809"
-      - "19809:19809/udp"
-    command: [ "./geth" ]
-    restart: always
+      - "10224:10224"
+      - "10224:10224/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
     stop_grace_period: 3m    
     volumes:
       - unichain-sepolia-op-geth-pruned-pebble-path:/data
@@ -34,12 +36,12 @@ services:
       - "GETH_AUTHRPC_VHOSTS=*"
     labels:                     
       - "traefik.enable=true"
-      - "traefik.http.middlewares.unichain-sepolia-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/unichain-sepolia"                      
-      - "traefik.http.services.unichain-sepolia-op-geth-pruned-pebble-path.loadbalancer.server.port=8545"
-      - "traefik.http.routers.unichain-sepolia-op-geth-pruned-pebble-path.entrypoints=websecure"                                              
-      - "traefik.http.routers.unichain-sepolia-op-geth-pruned-pebble-path.tls.certresolver=myresolver"                                        
-      - "traefik.http.routers.unichain-sepolia-op-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && PathPrefix(`/unichain-sepolia`)"                     
-      - "traefik.http.routers.unichain-sepolia-op-geth-pruned-pebble-path.middlewares=unichain-sepolia-op-geth-pruned-pebble-path-stripprefix, ipwhitelist"                           
+      - "traefik.http.middlewares.unichain-sepolia-op-geth-stripprefix.stripprefix.prefixes=/unichain-sepolia"                      
+      - "traefik.http.services.unichain-sepolia-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.unichain-sepolia-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.unichain-sepolia-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.unichain-sepolia-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/unichain-sepolia`)"                     
+      - "traefik.http.routers.unichain-sepolia-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
     networks:                                                                                         
       - chains
 
@@ -47,48 +49,47 @@ services:
   unichain-sepolia-node:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545     # RPC
-      - 3306     # P2P TCP
-      - 3306/udp # P2P UDP
-      - 7300     # metrics
-      - 6060     # pprof
+      - 8545
+      - 7300
+      - 6060
     ports:
-      - "3306:3306"
-      - "3306:3306/udp"
-    command: [ "sh", "./op-node-entrypoint" ]
-    restart: always
+      - "15224:15224"
+      - "15224:15224/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
     volumes:
       - .jwtsecret:/jwtsecret
     stop_grace_period: 30s
     environment:
       - "OP_NODE_NETWORK=unichain-sepolia"
       - "OP_NODE_SYNCMODE=execution-layer"
-      - "OP_NODE_L1_ETH_RPC=${UNICHAIN_L1_ETHEREUM_SEPOLIA_EXECUTION_RPC}"
-      - "OP_NODE_L2_ENGINE_AUTH_RAW=${JWTSECRET}"
+      - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
       - "OP_NODE_L2_ENGINE_RPC=http://unichain-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_STATIC=/ip4/35.230.102.175/tcp/9222/p2p/16Uiu2HAmSN33smB46ZtueBL2Hz1hsDy8tgSm1mqR38qAhwkX7ntd"
       - "OP_NODE_P2P_LISTEN_IP=0.0.0.0"
-      - "OP_NODE_P2P_LISTEN_TCP_PORT=3306"
-      - "OP_NODE_P2P_LISTEN_UDP_PORT=3306"
+      - "OP_NODE_P2P_LISTEN_TCP_PORT=15224"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15224"
       - "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_MAX_BATCH_SIZE=${UNICHAIN_SEPOLIA_L1_BATCH_SIZE:-20}"
-      #- "OP_NODE_L1_RPC_RATE_LIMIT=${UNICHAIN_SEPOLIA_L1_RATE_LIMIT:-30}"
-      - "OP_NODE_L1_RPC_KIND=${UNICHAIN_L1_ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}"
-      - "OP_NODE_L1_TRUST_RPC=${UNICHAIN_L1_ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}"
-      - "OP_NODE_L1_BEACON=${UNICHAIN_L1_ETHEREUM_SEPOLIA_BEACON_REST}"
-      - "OP_NODE_L1_BEACON_ARCHIVER=${UNICHAIN_L1_ETHEREUM_SEPOLIA_BEACON_ARCHIVER}"
+      - "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:  
-    unichain-sepolia-op-geth-pruned-pebble-path:
+    unichain-sepolia-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/worldchain-mainnet-op-geth-pruned-pebble-path.yml b/worldchain-mainnet-op-geth-pruned-pebble-path.yml
index 29f9ccbe..e954f652 100644
--- a/worldchain-mainnet-op-geth-pruned-pebble-path.yml
+++ b/worldchain-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,16 +2,18 @@ services:
   worldchain-mainnet:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545       # RPC / Websocket      
-      - 19809     # P2P TCP (currently unused)
-      - 19809/udp # P2P UDP (currently unused)
-      - 6060       # metrics
+      - 8545       
+      - 6060       
     ports:
-      - "19809:19809"
-      - "19809:19809/udp"
-    command: [ "./geth" ]
-    restart: always
+      - "10105:10105"
+      - "10105:10105/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
     stop_grace_period: 3m    
     volumes:
       - worldchain-mainnet-op-geth-pruned-pebble-path:/data
@@ -34,12 +36,12 @@ services:
       - "GETH_AUTHRPC_VHOSTS=*"
     labels:                     
       - "traefik.enable=true"
-      - "traefik.http.middlewares.worldchain-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/worldchain-mainnet"                      
-      - "traefik.http.services.worldchain-mainnet-op-geth-pruned-pebble-path.loadbalancer.server.port=8545"
-      - "traefik.http.routers.worldchain-mainnet-op-geth-pruned-pebble-path.entrypoints=websecure"                                              
-      - "traefik.http.routers.worldchain-mainnet-op-geth-pruned-pebble-path.tls.certresolver=myresolver"                                        
-      - "traefik.http.routers.worldchain-mainnet-op-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && PathPrefix(`/worldchain-mainnet`)"                     
-      - "traefik.http.routers.worldchain-mainnet-op-geth-pruned-pebble-path.middlewares=worldchain-mainnet-op-geth-pruned-pebble-path-stripprefix, ipwhitelist"                           
+      - "traefik.http.middlewares.worldchain-mainnet-op-geth-stripprefix.stripprefix.prefixes=/worldchain-mainnet"                      
+      - "traefik.http.services.worldchain-mainnet-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.worldchain-mainnet-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.worldchain-mainnet-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.worldchain-mainnet-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/worldchain-mainnet`)"                     
+      - "traefik.http.routers.worldchain-mainnet-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
     networks:                                                                                         
       - chains
 
@@ -47,48 +49,47 @@ services:
   worldchain-mainnet-node:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545     # RPC
-      - 3306     # P2P TCP
-      - 3306/udp # P2P UDP
-      - 7300     # metrics
-      - 6060     # pprof
+      - 8545
+      - 7300
+      - 6060
     ports:
-      - "3306:3306"
-      - "3306:3306/udp"
-    command: [ "sh", "./op-node-entrypoint" ]
-    restart: always
+      - "15105:15105"
+      - "15105:15105/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
     volumes:
       - .jwtsecret:/jwtsecret
     stop_grace_period: 30s
     environment:
       - "OP_NODE_NETWORK=worldchain-mainnet"
       - "OP_NODE_SYNCMODE=execution-layer"
-      - "OP_NODE_L1_ETH_RPC=${WORLDCHAIN_L1_ETHEREUM_MAINNET_EXECUTION_RPC}"
-      - "OP_NODE_L2_ENGINE_AUTH_RAW=${JWTSECRET}"
+      - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
       - "OP_NODE_L2_ENGINE_RPC=http://worldchain-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_STATIC=/ip4/35.230.102.175/tcp/9222/p2p/16Uiu2HAmSN33smB46ZtueBL2Hz1hsDy8tgSm1mqR38qAhwkX7ntd"
       - "OP_NODE_P2P_LISTEN_IP=0.0.0.0"
-      - "OP_NODE_P2P_LISTEN_TCP_PORT=3306"
-      - "OP_NODE_P2P_LISTEN_UDP_PORT=3306"
+      - "OP_NODE_P2P_LISTEN_TCP_PORT=15105"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15105"
       - "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_MAX_BATCH_SIZE=${WORLDCHAIN_MAINNET_L1_BATCH_SIZE:-20}"
-      #- "OP_NODE_L1_RPC_RATE_LIMIT=${WORLDCHAIN_MAINNET_L1_RATE_LIMIT:-30}"
-      - "OP_NODE_L1_RPC_KIND=${WORLDCHAIN_L1_ETHEREUM_MAINNET_EXECUTION_KIND:-basic}"
-      - "OP_NODE_L1_TRUST_RPC=${WORLDCHAIN_L1_ETHEREUM_MAINNET_EXECUTION_TRUST:-false}"
-      - "OP_NODE_L1_BEACON=${WORLDCHAIN_L1_ETHEREUM_MAINNET_BEACON_REST}"
-      - "OP_NODE_L1_BEACON_ARCHIVER=${WORLDCHAIN_L1_ETHEREUM_MAINNET_BEACON_ARCHIVER}"
+      - "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:  
-    worldchain-mainnet-op-geth-pruned-pebble-path:
+    worldchain-mainnet-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/worldchain-sepolia-op-geth-pruned-pebble-path.yml b/worldchain-sepolia-op-geth-pruned-pebble-path.yml
index 185ee166..3172f58e 100644
--- a/worldchain-sepolia-op-geth-pruned-pebble-path.yml
+++ b/worldchain-sepolia-op-geth-pruned-pebble-path.yml
@@ -2,16 +2,18 @@ services:
   worldchain-sepolia:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545       # RPC / Websocket      
-      - 19809     # P2P TCP (currently unused)
-      - 19809/udp # P2P UDP (currently unused)
-      - 6060       # metrics
+      - 8545       
+      - 6060       
     ports:
-      - "19809:19809"
-      - "19809:19809/udp"
-    command: [ "./geth" ]
-    restart: always
+      - "10872:10872"
+      - "10872:10872/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
     stop_grace_period: 3m    
     volumes:
       - worldchain-sepolia-op-geth-pruned-pebble-path:/data
@@ -34,12 +36,12 @@ services:
       - "GETH_AUTHRPC_VHOSTS=*"
     labels:                     
       - "traefik.enable=true"
-      - "traefik.http.middlewares.worldchain-sepolia-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/worldchain-sepolia"                      
-      - "traefik.http.services.worldchain-sepolia-op-geth-pruned-pebble-path.loadbalancer.server.port=8545"
-      - "traefik.http.routers.worldchain-sepolia-op-geth-pruned-pebble-path.entrypoints=websecure"                                              
-      - "traefik.http.routers.worldchain-sepolia-op-geth-pruned-pebble-path.tls.certresolver=myresolver"                                        
-      - "traefik.http.routers.worldchain-sepolia-op-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && PathPrefix(`/worldchain-sepolia`)"                     
-      - "traefik.http.routers.worldchain-sepolia-op-geth-pruned-pebble-path.middlewares=worldchain-sepolia-op-geth-pruned-pebble-path-stripprefix, ipwhitelist"                           
+      - "traefik.http.middlewares.worldchain-sepolia-op-geth-stripprefix.stripprefix.prefixes=/worldchain-sepolia"                      
+      - "traefik.http.services.worldchain-sepolia-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.worldchain-sepolia-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.worldchain-sepolia-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.worldchain-sepolia-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/worldchain-sepolia`)"                     
+      - "traefik.http.routers.worldchain-sepolia-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
     networks:                                                                                         
       - chains
 
@@ -47,48 +49,47 @@ services:
   worldchain-sepolia-node:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545     # RPC
-      - 3306     # P2P TCP
-      - 3306/udp # P2P UDP
-      - 7300     # metrics
-      - 6060     # pprof
+      - 8545
+      - 7300
+      - 6060
     ports:
-      - "3306:3306"
-      - "3306:3306/udp"
-    command: [ "sh", "./op-node-entrypoint" ]
-    restart: always
+      - "15872:15872"
+      - "15872:15872/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
     volumes:
       - .jwtsecret:/jwtsecret
     stop_grace_period: 30s
     environment:
       - "OP_NODE_NETWORK=worldchain-sepolia"
       - "OP_NODE_SYNCMODE=execution-layer"
-      - "OP_NODE_L1_ETH_RPC=${WORLDCHAIN_L1_ETHEREUM_SEPOLIA_EXECUTION_RPC}"
-      - "OP_NODE_L2_ENGINE_AUTH_RAW=${JWTSECRET}"
+      - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
       - "OP_NODE_L2_ENGINE_RPC=http://worldchain-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_STATIC=/ip4/35.230.102.175/tcp/9222/p2p/16Uiu2HAmSN33smB46ZtueBL2Hz1hsDy8tgSm1mqR38qAhwkX7ntd"
       - "OP_NODE_P2P_LISTEN_IP=0.0.0.0"
-      - "OP_NODE_P2P_LISTEN_TCP_PORT=3306"
-      - "OP_NODE_P2P_LISTEN_UDP_PORT=3306"
+      - "OP_NODE_P2P_LISTEN_TCP_PORT=15872"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15872"
       - "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_MAX_BATCH_SIZE=${WORLDCHAIN_SEPOLIA_L1_BATCH_SIZE:-20}"
-      #- "OP_NODE_L1_RPC_RATE_LIMIT=${WORLDCHAIN_SEPOLIA_L1_RATE_LIMIT:-30}"
-      - "OP_NODE_L1_RPC_KIND=${WORLDCHAIN_L1_ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}"
-      - "OP_NODE_L1_TRUST_RPC=${WORLDCHAIN_L1_ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}"
-      - "OP_NODE_L1_BEACON=${WORLDCHAIN_L1_ETHEREUM_SEPOLIA_BEACON_REST}"
-      - "OP_NODE_L1_BEACON_ARCHIVER=${WORLDCHAIN_L1_ETHEREUM_SEPOLIA_BEACON_ARCHIVER}"
+      - "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:  
-    worldchain-sepolia-op-geth-pruned-pebble-path:
+    worldchain-sepolia-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/zora-mainnet-op-geth-pruned-pebble-path.yml b/zora-mainnet-op-geth-pruned-pebble-path.yml
index 48d0b370..b35cef61 100644
--- a/zora-mainnet-op-geth-pruned-pebble-path.yml
+++ b/zora-mainnet-op-geth-pruned-pebble-path.yml
@@ -2,16 +2,18 @@ services:
   zora-mainnet:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545       # RPC / Websocket      
-      - 19809     # P2P TCP (currently unused)
-      - 19809/udp # P2P UDP (currently unused)
-      - 6060       # metrics
+      - 8545       
+      - 6060       
     ports:
-      - "19809:19809"
-      - "19809:19809/udp"
-    command: [ "./geth" ]
-    restart: always
+      - "10457:10457"
+      - "10457:10457/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
     stop_grace_period: 3m    
     volumes:
       - zora-mainnet-op-geth-pruned-pebble-path:/data
@@ -34,12 +36,12 @@ services:
       - "GETH_AUTHRPC_VHOSTS=*"
     labels:                     
       - "traefik.enable=true"
-      - "traefik.http.middlewares.zora-stripprefix.stripprefix.prefixes=/zora-mainnet"                      
-      - "traefik.http.services.zora.loadbalancer.server.port=8545"
-      - "traefik.http.routers.zora.entrypoints=websecure"                                              
-      - "traefik.http.routers.zora.tls.certresolver=myresolver"                                        
-      - "traefik.http.routers.zora.rule=Host(`$DOMAIN`) && PathPrefix(`/zora-mainnet`)"                     
-      - "traefik.http.routers.zora.middlewares=zora-stripprefix, ipwhitelist"                           
+      - "traefik.http.middlewares.zora-mainnet-op-geth-stripprefix.stripprefix.prefixes=/zora-mainnet"                      
+      - "traefik.http.services.zora-mainnet-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.zora-mainnet-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.zora-mainnet-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.zora-mainnet-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/zora-mainnet`)"                     
+      - "traefik.http.routers.zora-mainnet-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
     networks:                                                                                         
       - chains
 
@@ -47,48 +49,47 @@ services:
   zora-mainnet-node:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545     # RPC
-      - 3306     # P2P TCP
-      - 3306/udp # P2P UDP
-      - 7300     # metrics
-      - 6060     # pprof
+      - 8545
+      - 7300
+      - 6060
     ports:
-      - "3306:3306"
-      - "3306:3306/udp"
-    command: [ "sh", "./op-node-entrypoint" ]
-    restart: always
+      - "15457:15457"
+      - "15457:15457/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
     volumes:
       - .jwtsecret:/jwtsecret
     stop_grace_period: 30s
     environment:
       - "OP_NODE_NETWORK=zora-mainnet"
       - "OP_NODE_SYNCMODE=execution-layer"
-      - "OP_NODE_L1_ETH_RPC=${ZORA_L1_ETHEREUM_MAINNET_EXECUTION_RPC}"
-      - "OP_NODE_L2_ENGINE_AUTH_RAW=${JWTSECRET}"
+      - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
       - "OP_NODE_L2_ENGINE_RPC=http://zora-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_STATIC=/ip4/35.230.102.175/tcp/9222/p2p/16Uiu2HAmSN33smB46ZtueBL2Hz1hsDy8tgSm1mqR38qAhwkX7ntd"
       - "OP_NODE_P2P_LISTEN_IP=0.0.0.0"
-      - "OP_NODE_P2P_LISTEN_TCP_PORT=3306"
-      - "OP_NODE_P2P_LISTEN_UDP_PORT=3306"
+      - "OP_NODE_P2P_LISTEN_TCP_PORT=15457"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15457"
       - "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_MAX_BATCH_SIZE=${ZORA_SEPOLIA_L1_BATCH_SIZE:-20}"
-      #- "OP_NODE_L1_RPC_RATE_LIMIT=${ZORA_SEPOLIA_L1_RATE_LIMIT:-30}"
-      - "OP_NODE_L1_RPC_KIND=${ZORA_L1_ETHEREUM_MAINNET_EXECUTION_KIND:-basic}"
-      - "OP_NODE_L1_TRUST_RPC=${ZORA_L1_ETHEREUM_MAINNET_EXECUTION_TRUST:-false}"
-      - "OP_NODE_L1_BEACON=${ZORA_L1_ETHEREUM_MAINNET_BEACON_REST}"
-      - "OP_NODE_L1_BEACON_ARCHIVER=${ZORA_L1_ETHEREUM_MAINNET_BEACON_ARCHIVER}"
+      - "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:  
-    zora-mainnet-op-geth-pruned-pebble-path:
+    zora-mainnet-op-geth-pruned-pebble-path:
\ No newline at end of file
diff --git a/zora-sepolia-op-geth-pruned-pebble-path.yml b/zora-sepolia-op-geth-pruned-pebble-path.yml
index e2049cb5..f66375c5 100644
--- a/zora-sepolia-op-geth-pruned-pebble-path.yml
+++ b/zora-sepolia-op-geth-pruned-pebble-path.yml
@@ -2,16 +2,18 @@ services:
   zora-sepolia:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545       # RPC / Websocket      
-      - 19809     # P2P TCP (currently unused)
-      - 19809/udp # P2P UDP (currently unused)
-      - 6060       # metrics
+      - 8545       
+      - 6060       
     ports:
-      - "19809:19809"
-      - "19809:19809/udp"
-    command: [ "./geth" ]
-    restart: always
+      - "10505:10505"
+      - "10505:10505/udp"
+    entrypoint: [ "./geth" ]
+    restart: unless-stopped
     stop_grace_period: 3m    
     volumes:
       - zora-sepolia-op-geth-pruned-pebble-path:/data
@@ -34,12 +36,12 @@ services:
       - "GETH_AUTHRPC_VHOSTS=*"
     labels:                     
       - "traefik.enable=true"
-      - "traefik.http.middlewares.zora-stripprefix.stripprefix.prefixes=/zora-sepolia"                      
-      - "traefik.http.services.zora.loadbalancer.server.port=8545"
-      - "traefik.http.routers.zora.entrypoints=websecure"                                              
-      - "traefik.http.routers.zora.tls.certresolver=myresolver"                                        
-      - "traefik.http.routers.zora.rule=Host(`$DOMAIN`) && PathPrefix(`/zora-sepolia`)"                     
-      - "traefik.http.routers.zora.middlewares=zora-stripprefix, ipwhitelist"                           
+      - "traefik.http.middlewares.zora-sepolia-op-geth-stripprefix.stripprefix.prefixes=/zora-sepolia"                      
+      - "traefik.http.services.zora-sepolia-op-geth.loadbalancer.server.port=8545"
+      - "traefik.http.routers.zora-sepolia-op-geth.entrypoints=websecure"                                              
+      - "traefik.http.routers.zora-sepolia-op-geth.tls.certresolver=myresolver"                                        
+      - "traefik.http.routers.zora-sepolia-op-geth.rule=Host(`$DOMAIN`) && PathPrefix(`/zora-sepolia`)"                     
+      - "traefik.http.routers.zora-sepolia-op-geth.middlewares=zora-stripprefix, ipwhitelist"                           
     networks:                                                                                         
       - chains
 
@@ -47,48 +49,47 @@ services:
   zora-sepolia-node:
     build:
       context: ./op
+      args:
+         OP_VERSION: ${OP_NODE_VERSION:-v1.12.2}
+         GETH_VERSION: ${OP_GETH_VERSION:-v1.101503.1}
+         
     expose:
-      - 8545     # RPC
-      - 3306     # P2P TCP
-      - 3306/udp # P2P UDP
-      - 7300     # metrics
-      - 6060     # pprof
+      - 8545
+      - 7300
+      - 6060
     ports:
-      - "3306:3306"
-      - "3306:3306/udp"
-    command: [ "sh", "./op-node-entrypoint" ]
-    restart: always
+      - "15505:15505"
+      - "15505:15505/udp"
+    entrypoint: [ "./op-node" ]
+    restart: unless-stopped
     volumes:
       - .jwtsecret:/jwtsecret
     stop_grace_period: 30s
     environment:
       - "OP_NODE_NETWORK=zora-sepolia"
       - "OP_NODE_SYNCMODE=execution-layer"
-      - "OP_NODE_L1_ETH_RPC=${ZORA_L1_ETHEREUM_SEPOLIA_EXECUTION_RPC}"
-      - "OP_NODE_L2_ENGINE_AUTH_RAW=${JWTSECRET}"
+      - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
       - "OP_NODE_L2_ENGINE_RPC=http://zora-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_STATIC=/ip4/35.230.102.175/tcp/9222/p2p/16Uiu2HAmSN33smB46ZtueBL2Hz1hsDy8tgSm1mqR38qAhwkX7ntd"
       - "OP_NODE_P2P_LISTEN_IP=0.0.0.0"
-      - "OP_NODE_P2P_LISTEN_TCP_PORT=3306"
-      - "OP_NODE_P2P_LISTEN_UDP_PORT=3306"
+      - "OP_NODE_P2P_LISTEN_TCP_PORT=15505"
+      - "OP_NODE_P2P_LISTEN_UDP_PORT=15505"
       - "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_MAX_BATCH_SIZE=${ZORA_SEPOLIA_L1_BATCH_SIZE:-20}"
-      #- "OP_NODE_L1_RPC_RATE_LIMIT=${ZORA_SEPOLIA_L1_RATE_LIMIT:-30}"
-      - "OP_NODE_L1_RPC_KIND=${ZORA_L1_ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}"
-      - "OP_NODE_L1_TRUST_RPC=${ZORA_L1_ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}"
-      - "OP_NODE_L1_BEACON=${ZORA_L1_ETHEREUM_SEPOLIA_BEACON_REST}"
-      - "OP_NODE_L1_BEACON_ARCHIVER=${ZORA_L1_ETHEREUM_SEPOLIA_BEACON_ARCHIVER}"
+      - "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:  
-    zora-sepolia-op-geth-pruned-pebble-path:
+    zora-sepolia-op-geth-pruned-pebble-path:
\ No newline at end of file