diff --git a/taiko/geth/taiko-alethia-geth-archive-leveldb-hash.yml b/taiko/geth/taiko-alethia-geth-archive-leveldb-hash.yml
index 2eb17fab..0ddedcfa 100644
--- a/taiko/geth/taiko-alethia-geth-archive-leveldb-hash.yml
+++ b/taiko/geth/taiko-alethia-geth-archive-leveldb-hash.yml
@@ -58,24 +58,21 @@ services:
     env_file:
       - ./taiko/geth.env
     environment:
-      - "L1_ENDPOINT_HTTP=${ETHEREUM_MAINNET_EXECUTION_RPC}"
-      - "TAIKO_TOKEN_L1_ADDRESS=${TAIKO_ALETHIA_ARCHIVE_TOKEN_ADDRESS}"
-      - "ASSIGNMENT_HOOK_L1_ADDRESS=${TAIKO_ALETHIA_ARCHIVE_HOOK_ADDRESS}"
-      - "L1_ADDRESS=${TAIKO_ALETHIA_ARCHIVE_L1_ADDRESS}"
-      - "L2_ADDRESS=${TAIKO_ALETHIA_ARCHIVE_L2_ADDRESS}"           
+      #- "L1_ENDPOINT_HTTP=${ETHEREUM_MAINNET_EXECUTION_RPC}"
+      #- "TAIKO_TOKEN_L1_ADDRESS=${TAIKO_ALETHIA_ARCHIVE_TOKEN_ADDRESS}"
+      #- "ASSIGNMENT_HOOK_L1_ADDRESS=${TAIKO_ALETHIA_ARCHIVE_HOOK_ADDRESS}"
+      - "TAIKO_L1=${TAIKO_ALETHIA_ARCHIVE_L1_ADDRESS}"
+      - "TAIKO_L2=${TAIKO_ALETHIA_ARCHIVE_L2_ADDRESS}"
+      - "L1_WS=${ETHEREUM_MAINNET_EXECUTION_WS}"
+      - "L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}"
+      - "L2_WS=ws://taiko-alethia-archive:8545"
+      - "L2_AUTH=http://taiko-alethia-archive:8551"
+      - "P2P_SYNC=true"
+      - "P2P_CHECK_POINT_SYNC_URL=https://rpc.mainnet.taiko.xyz"
+      - "JWT_SECRET=/jwtsecret"
     volumes:
       - .jwtsecret:/jwtsecret
     entrypoint: ["taiko-client", "driver"]
-    command:
-      - "--l1.ws=${ETHEREUM_MAINNET_EXECUTION_WS}"
-      - "--l2.ws=ws://taiko-alethia-archive:8545"
-      - "--l1.beacon=${ETHEREUM_MAINNET_BEACON_REST}"
-      - "--l2.auth=http://taiko-alethia-archive:8551"
-      - "--taikoL1=${L1_ADDRESS}"
-      - "--taikoL2=${L2_ADDRESS}"
-      - "--jwtSecret=/jwtsecret"
-      - "--p2p.sync"
-      - "--p2p.checkPointSyncUrl=https://rpc.mainnet.taiko.xyz"
     networks:
       - chains
       
diff --git a/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml b/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml
index 71db85cf..c02c1fb6 100644
--- a/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml
+++ b/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml
@@ -58,24 +58,21 @@ services:
     env_file:
       - ./taiko/geth.env
     environment:
-      - "L1_ENDPOINT_HTTP=${ETHEREUM_MAINNET_EXECUTION_RPC}"
-      - "TAIKO_TOKEN_L1_ADDRESS=${TAIKO_ALETHIA_TOKEN_ADDRESS}"
-      - "ASSIGNMENT_HOOK_L1_ADDRESS=${TAIKO_ALETHIA_HOOK_ADDRESS}"
-      - "L1_ADDRESS=${TAIKO_ALETHIA_L1_ADDRESS}"
-      - "L2_ADDRESS=${TAIKO_ALETHIA_L2_ADDRESS}"           
+      #- "L1_ENDPOINT_HTTP=${ETHEREUM_MAINNET_EXECUTION_RPC}"
+      #- "TAIKO_TOKEN_L1_ADDRESS=${TAIKO_ALETHIA_TOKEN_ADDRESS}"
+      #- "ASSIGNMENT_HOOK_L1_ADDRESS=${TAIKO_ALETHIA_HOOK_ADDRESS}"
+      - "TAIKO_L1=${TAIKO_ALETHIA_L1_ADDRESS}"
+      - "TAIKO_L2=${TAIKO_ALETHIA_L2_ADDRESS}"
+      - "L1_WS=${ETHEREUM_MAINNET_EXECUTION_WS}"
+      - "L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}"
+      - "L2_WS=ws://taiko-alethia:8545"
+      - "L2_AUTH=http://taiko-alethia:8551"
+      - "P2P_SYNC=true"
+      - "P2P_CHECK_POINT_SYNC_URL=https://rpc.mainnet.taiko.xyz"
+      - "JWT_SECRET=/jwtsecret"
     volumes:
       - .jwtsecret:/jwtsecret
     entrypoint: ["taiko-client", "driver"]
-    command:
-      - "--l1.ws=${ETHEREUM_MAINNET_EXECUTION_WS}"
-      - "--l2.ws=ws://taiko-alethia:8545"
-      - "--l1.beacon=${ETHEREUM_MAINNET_BEACON_REST}"
-      - "--l2.auth=http://taiko-alethia:8551"
-      - "--taikoL1=${L1_ADDRESS}"
-      - "--taikoL2=${L2_ADDRESS}"
-      - "--jwtSecret=/jwtsecret"
-      - "--p2p.sync"
-      - "--p2p.checkPointSyncUrl=https://rpc.mainnet.taiko.xyz"
     networks:
       - chains
       
diff --git a/taiko/geth/taiko-hekla-geth-archive-leveldb-hash.yml b/taiko/geth/taiko-hekla-geth-archive-leveldb-hash.yml
index cde95130..51b71b2a 100644
--- a/taiko/geth/taiko-hekla-geth-archive-leveldb-hash.yml
+++ b/taiko/geth/taiko-hekla-geth-archive-leveldb-hash.yml
@@ -58,24 +58,21 @@ services:
     env_file:
       - ./taiko/geth.env
     environment:
-      - "L1_ENDPOINT_HTTP=${ETHEREUM_HOLESKY_EXECUTION_RPC}"
-      - "TAIKO_TOKEN_L1_ADDRESS=${TAIKO_HEKLA_ARCHIVE_TOKEN_ADDRESS}"
-      - "ASSIGNMENT_HOOK_L1_ADDRESS=${TAIKO_HEKLA_ARCHIVE_HOOK_ADDRESS}"
-      - "L1_ADDRESS=${TAIKO_HEKLA_ARCHIVE_L1_ADDRESS}"
-      - "L2_ADDRESS=${TAIKO_HEKLA_ARCHIVE_L2_ADDRESS}"           
+      #- "L1_ENDPOINT_HTTP=${ETHEREUM_HOLESKY_EXECUTION_RPC}"
+      #- "TAIKO_TOKEN_L1_ADDRESS=${TAIKO_HEKLA_ARCHIVE_TOKEN_ADDRESS}"
+      #- "ASSIGNMENT_HOOK_L1_ADDRESS=${TAIKO_HEKLA_ARCHIVE_HOOK_ADDRESS}"
+      - "TAIKO_L1=${TAIKO_HEKLA_ARCHIVE_L1_ADDRESS}"
+      - "TAIKO_L2=${TAIKO_HEKLA_ARCHIVE_L2_ADDRESS}"
+      - "L1_WS=${ETHEREUM_HOLESKY_EXECUTION_WS}"
+      - "L1_BEACON=${ETHEREUM_HOLESKY_BEACON_REST}"
+      - "L2_WS=ws://taiko-hekla-archive:8545"
+      - "L2_AUTH=http://taiko-hekla-archive:8551"
+      - "P2P_SYNC=true"
+      - "P2P_CHECK_POINT_SYNC_URL=https://rpc.hekla.taiko.xyz"
+      - "JWT_SECRET=/jwtsecret"
     volumes:
       - .jwtsecret:/jwtsecret
     entrypoint: ["taiko-client", "driver"]
-    command:
-      - "--l1.ws=${ETHEREUM_HOLESKY_EXECUTION_WS}"
-      - "--l2.ws=ws://taiko-hekla-archive:8545"
-      - "--l1.beacon=${ETHEREUM_HOLESKY_BEACON_REST}"
-      - "--l2.auth=http://taiko-hekla-archive:8551"
-      - "--taikoL1=${L1_ADDRESS}"
-      - "--taikoL2=${L2_ADDRESS}"
-      - "--jwtSecret=/jwtsecret"
-      - "--p2p.sync"
-      - "--p2p.checkPointSyncUrl=https://rpc.hekla.taiko.xyz"
     networks:
       - chains
       
diff --git a/taiko/geth/taiko-hekla-geth-pruned-pebble-path.yml b/taiko/geth/taiko-hekla-geth-pruned-pebble-path.yml
index f3118369..448e342d 100644
--- a/taiko/geth/taiko-hekla-geth-pruned-pebble-path.yml
+++ b/taiko/geth/taiko-hekla-geth-pruned-pebble-path.yml
@@ -58,24 +58,21 @@ services:
     env_file:
       - ./taiko/geth.env
     environment:
-      - "L1_ENDPOINT_HTTP=${ETHEREUM_HOLESKY_EXECUTION_RPC}"
-      - "TAIKO_TOKEN_L1_ADDRESS=${TAIKO_HEKLA_TOKEN_ADDRESS}"
-      - "ASSIGNMENT_HOOK_L1_ADDRESS=${TAIKO_HEKLA_HOOK_ADDRESS}"
-      - "L1_ADDRESS=${TAIKO_HEKLA_L1_ADDRESS}"
-      - "L2_ADDRESS=${TAIKO_HEKLA_L2_ADDRESS}"           
+      #- "L1_ENDPOINT_HTTP=${ETHEREUM_HOLESKY_EXECUTION_RPC}"
+      #- "TAIKO_TOKEN_L1_ADDRESS=${TAIKO_HEKLA_TOKEN_ADDRESS}"
+      #- "ASSIGNMENT_HOOK_L1_ADDRESS=${TAIKO_HEKLA_HOOK_ADDRESS}"
+      - "TAIKO_L1=${TAIKO_HEKLA_L1_ADDRESS}"
+      - "TAIKO_L2=${TAIKO_HEKLA_L2_ADDRESS}"
+      - "L1_WS=${ETHEREUM_HOLESKY_EXECUTION_WS}"
+      - "L1_BEACON=${ETHEREUM_HOLESKY_BEACON_REST}"
+      - "L2_WS=ws://taiko-hekla:8545"
+      - "L2_AUTH=http://taiko-hekla:8551"
+      - "P2P_SYNC=true"
+      - "P2P_CHECK_POINT_SYNC_URL=https://rpc.hekla.taiko.xyz"
+      - "JWT_SECRET=/jwtsecret"
     volumes:
       - .jwtsecret:/jwtsecret
     entrypoint: ["taiko-client", "driver"]
-    command:
-      - "--l1.ws=${ETHEREUM_HOLESKY_EXECUTION_WS}"
-      - "--l2.ws=ws://taiko-hekla:8545"
-      - "--l1.beacon=${ETHEREUM_HOLESKY_BEACON_REST}"
-      - "--l2.auth=http://taiko-hekla:8551"
-      - "--taikoL1=${L1_ADDRESS}"
-      - "--taikoL2=${L2_ADDRESS}"
-      - "--jwtSecret=/jwtsecret"
-      - "--p2p.sync"
-      - "--p2p.checkPointSyncUrl=https://rpc.hekla.taiko.xyz"
     networks:
       - chains