diff --git a/op/geth/base-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/base-mainnet-op-geth-archive-leveldb-hash.yml
index 9a4a5a6c..ebda8c4c 100644
--- a/op/geth/base-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/base-mainnet-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namebase-mainnet
+      - 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"
diff --git a/op/geth/base-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/base-mainnet-op-geth-pruned-pebble-path.yml
index 92239878..5f759b02 100644
--- a/op/geth/base-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/base-mainnet-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namebase-mainnet
+      - 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"
diff --git a/op/geth/base-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/base-sepolia-op-geth-archive-leveldb-hash.yml
index 83102df2..6738120c 100644
--- a/op/geth/base-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/base-sepolia-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namebase-sepolia
+      - 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"
diff --git a/op/geth/base-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/base-sepolia-op-geth-pruned-pebble-path.yml
index 5ed9f364..9bf21278 100644
--- a/op/geth/base-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/base-sepolia-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namebase-sepolia
+      - 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"
diff --git a/op/geth/bob-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/bob-mainnet-op-geth-archive-leveldb-hash.yml
index 072d6417..9d8a6cec 100644
--- a/op/geth/bob-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/bob-mainnet-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namebob-mainnet
+      - 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"
diff --git a/op/geth/bob-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/bob-mainnet-op-geth-pruned-pebble-path.yml
index 21752218..9595caff 100644
--- a/op/geth/bob-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/bob-mainnet-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namebob-mainnet
+      - 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"
diff --git a/op/geth/boba-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/boba-mainnet-op-geth-pruned-pebble-path.yml
index 82c51e90..3523d109 100644
--- a/op/geth/boba-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/boba-mainnet-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameboba-mainnet
+      - OP_NODE_NETWORK=boba-mainnet
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/boba-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/boba-sepolia-op-geth-pruned-pebble-path.yml
index 042642c4..bb3429dc 100644
--- a/op/geth/boba-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/boba-sepolia-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameboba-sepolia
+      - OP_NODE_NETWORK=boba-sepolia
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/hashkeychain-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/hashkeychain-mainnet-op-geth-archive-leveldb-hash.yml
index d19ee735..171343af 100644
--- a/op/geth/hashkeychain-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/hashkeychain-mainnet-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namehashkeychain-mainnet
+      - 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"
diff --git a/op/geth/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml
index 6f0b8580..9e76b495 100644
--- a/op/geth/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namehashkeychain-mainnet
+      - 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"
diff --git a/op/geth/ink-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/ink-mainnet-op-geth-archive-leveldb-hash.yml
index d342fd10..ec19d484 100644
--- a/op/geth/ink-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/ink-mainnet-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameink-mainnet
+      - OP_NODE_NETWORK=ink-mainnet
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/ink-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/ink-mainnet-op-geth-pruned-pebble-path.yml
index c3ae237e..225cfaa4 100644
--- a/op/geth/ink-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/ink-mainnet-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameink-mainnet
+      - OP_NODE_NETWORK=ink-mainnet
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/ink-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/ink-sepolia-op-geth-archive-leveldb-hash.yml
index b307a6a9..3fdac235 100644
--- a/op/geth/ink-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/ink-sepolia-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameink-sepolia
+      - OP_NODE_NETWORK=ink-sepolia
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/ink-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/ink-sepolia-op-geth-pruned-pebble-path.yml
index 781a23a5..096f61d1 100644
--- a/op/geth/ink-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/ink-sepolia-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameink-sepolia
+      - OP_NODE_NETWORK=ink-sepolia
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/lisk-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/lisk-mainnet-op-geth-archive-leveldb-hash.yml
index 2385ee29..ce9640a0 100644
--- a/op/geth/lisk-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/lisk-mainnet-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namelisk-mainnet
+      - 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"
diff --git a/op/geth/lisk-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/lisk-mainnet-op-geth-pruned-pebble-path.yml
index 1856f4cc..913c34b4 100644
--- a/op/geth/lisk-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/lisk-mainnet-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namelisk-mainnet
+      - 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"
diff --git a/op/geth/lisk-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/lisk-sepolia-op-geth-archive-leveldb-hash.yml
index dbfad890..83788a80 100644
--- a/op/geth/lisk-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/lisk-sepolia-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namelisk-sepolia
+      - 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"
diff --git a/op/geth/lisk-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/lisk-sepolia-op-geth-pruned-pebble-path.yml
index 4200a11e..63ba8375 100644
--- a/op/geth/lisk-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/lisk-sepolia-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namelisk-sepolia
+      - 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"
diff --git a/op/geth/metal-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/metal-mainnet-op-geth-archive-leveldb-hash.yml
index c83d054f..f1d8343a 100644
--- a/op/geth/metal-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/metal-mainnet-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namemetal-mainnet
+      - 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"
diff --git a/op/geth/metal-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/metal-mainnet-op-geth-pruned-pebble-path.yml
index 5f103f61..e7166249 100644
--- a/op/geth/metal-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/metal-mainnet-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namemetal-mainnet
+      - 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"
diff --git a/op/geth/metal-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/metal-sepolia-op-geth-archive-leveldb-hash.yml
index 5a680cc4..50329438 100644
--- a/op/geth/metal-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/metal-sepolia-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namemetal-sepolia
+      - 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"
diff --git a/op/geth/metal-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/metal-sepolia-op-geth-pruned-pebble-path.yml
index 559882fe..0e749512 100644
--- a/op/geth/metal-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/metal-sepolia-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namemetal-sepolia
+      - 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"
diff --git a/op/geth/mode-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/mode-mainnet-op-geth-archive-leveldb-hash.yml
index 04b62b3c..0a436bde 100644
--- a/op/geth/mode-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/mode-mainnet-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namemode-mainnet
+      - OP_NODE_NETWORK=mode-mainnet
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/mode-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/mode-mainnet-op-geth-pruned-pebble-path.yml
index 599c7d81..bdb30b1a 100644
--- a/op/geth/mode-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/mode-mainnet-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namemode-mainnet
+      - OP_NODE_NETWORK=mode-mainnet
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/mode-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/mode-sepolia-op-geth-archive-leveldb-hash.yml
index 1a54038e..ef0e472e 100644
--- a/op/geth/mode-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/mode-sepolia-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namemode-sepolia
+      - OP_NODE_NETWORK=mode-sepolia
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/mode-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/mode-sepolia-op-geth-pruned-pebble-path.yml
index 23b49d0a..3c29add8 100644
--- a/op/geth/mode-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/mode-sepolia-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namemode-sepolia
+      - OP_NODE_NETWORK=mode-sepolia
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/op-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/op-mainnet-op-geth-archive-leveldb-hash.yml
index 4b867c5c..f68862c8 100644
--- a/op/geth/op-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/op-mainnet-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameop-mainnet
+      - 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"
diff --git a/op/geth/op-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/op-mainnet-op-geth-pruned-pebble-path.yml
index 19db7536..0b3f6c27 100644
--- a/op/geth/op-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/op-mainnet-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameop-mainnet
+      - 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"
diff --git a/op/geth/op-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/op-sepolia-op-geth-archive-leveldb-hash.yml
index f7b1126b..7bc262a5 100644
--- a/op/geth/op-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/op-sepolia-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameop-sepolia
+      - 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"
diff --git a/op/geth/op-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/op-sepolia-op-geth-pruned-pebble-path.yml
index 935faac5..57dc9acc 100644
--- a/op/geth/op-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/op-sepolia-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameop-sepolia
+      - 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"
diff --git a/op/geth/snax-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/snax-mainnet-op-geth-archive-leveldb-hash.yml
index 48907822..5bf74adf 100644
--- a/op/geth/snax-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/snax-mainnet-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namesnax-mainnet
+      - OP_NODE_NETWORK=snax-mainnet
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/snax-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/snax-mainnet-op-geth-pruned-pebble-path.yml
index c2762bae..bf42c4bd 100644
--- a/op/geth/snax-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/snax-mainnet-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namesnax-mainnet
+      - OP_NODE_NETWORK=snax-mainnet
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/swell-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/swell-mainnet-op-geth-archive-leveldb-hash.yml
index 8e94daf1..855137f7 100644
--- a/op/geth/swell-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/swell-mainnet-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameswell-mainnet
+      - 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"
diff --git a/op/geth/swell-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/swell-mainnet-op-geth-pruned-pebble-path.yml
index 99ffe2cf..4971e5a3 100644
--- a/op/geth/swell-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/swell-mainnet-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameswell-mainnet
+      - 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"
diff --git a/op/geth/unichain-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/unichain-mainnet-op-geth-archive-leveldb-hash.yml
index a1b6d93e..c5a28477 100644
--- a/op/geth/unichain-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/unichain-mainnet-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameunichain-mainnet
+      - OP_NODE_NETWORK=unichain-mainnet
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/unichain-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/unichain-mainnet-op-geth-pruned-pebble-path.yml
index b15e127d..d97d9279 100644
--- a/op/geth/unichain-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/unichain-mainnet-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameunichain-mainnet
+      - OP_NODE_NETWORK=unichain-mainnet
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/unichain-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/unichain-sepolia-op-geth-archive-leveldb-hash.yml
index 3fc4b70b..cac4e12d 100644
--- a/op/geth/unichain-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/unichain-sepolia-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameunichain-sepolia
+      - OP_NODE_NETWORK=unichain-sepolia
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/unichain-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/unichain-sepolia-op-geth-pruned-pebble-path.yml
index 0083684c..b99dec4c 100644
--- a/op/geth/unichain-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/unichain-sepolia-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameunichain-sepolia
+      - OP_NODE_NETWORK=unichain-sepolia
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/worldchain-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/worldchain-mainnet-op-geth-archive-leveldb-hash.yml
index 4ed845eb..ca1f026c 100644
--- a/op/geth/worldchain-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/worldchain-mainnet-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameworldchain-mainnet
+      - OP_NODE_NETWORK=worldchain-mainnet
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/worldchain-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/worldchain-mainnet-op-geth-pruned-pebble-path.yml
index b8a8dd6d..8c582d21 100644
--- a/op/geth/worldchain-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/worldchain-mainnet-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameworldchain-mainnet
+      - OP_NODE_NETWORK=worldchain-mainnet
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/worldchain-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/worldchain-sepolia-op-geth-archive-leveldb-hash.yml
index 17722dbe..a80eb277 100644
--- a/op/geth/worldchain-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/worldchain-sepolia-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameworldchain-sepolia
+      - OP_NODE_NETWORK=worldchain-sepolia
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/worldchain-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/worldchain-sepolia-op-geth-pruned-pebble-path.yml
index db90bbd8..d2444e03 100644
--- a/op/geth/worldchain-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/worldchain-sepolia-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_nameworldchain-sepolia
+      - OP_NODE_NETWORK=worldchain-sepolia
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/zora-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/zora-mainnet-op-geth-archive-leveldb-hash.yml
index f1b7b890..2e37a41d 100644
--- a/op/geth/zora-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/zora-mainnet-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namezora-mainnet
+      - OP_NODE_NETWORK=zora-mainnet
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/zora-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/zora-mainnet-op-geth-pruned-pebble-path.yml
index 3cfbe730..73578407 100644
--- a/op/geth/zora-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/zora-mainnet-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namezora-mainnet
+      - OP_NODE_NETWORK=zora-mainnet
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/zora-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/zora-sepolia-op-geth-archive-leveldb-hash.yml
index 8b5e7f29..c51faa6c 100644
--- a/op/geth/zora-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/zora-sepolia-op-geth-archive-leveldb-hash.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namezora-sepolia
+      - OP_NODE_NETWORK=zora-sepolia
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"
diff --git a/op/geth/zora-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/zora-sepolia-op-geth-pruned-pebble-path.yml
index c4d78f36..bf9403fd 100644
--- a/op/geth/zora-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/zora-sepolia-op-geth-pruned-pebble-path.yml
@@ -75,7 +75,7 @@ services:
     stop_grace_period: 30s
     
     environment:
-      - OP_NODE_NETWORK=service_namezora-sepolia
+      - OP_NODE_NETWORK=zora-sepolia
       - "OP_NODE_SYNCMODE=execution-layer"
       - "OP_NODE_L1_ETH_RPC=${ETHEREUM_SEPOLIA_EXECUTION_RPC}"
       - "OP_NODE_L2_ENGINE_AUTH=/jwtsecret"