diff --git a/taiko/geth/taiko-alethia-geth-archive-leveldb-hash.yml b/taiko/geth/taiko-alethia-geth-archive-leveldb-hash.yml
index 6f96e391..2048aff7 100644
--- a/taiko/geth/taiko-alethia-geth-archive-leveldb-hash.yml
+++ b/taiko/geth/taiko-alethia-geth-archive-leveldb-hash.yml
@@ -14,7 +14,8 @@ services:
     ports:
       - "10088:10088"
       - "10088:10088/udp"
-    command: >
+    entrypoint: ["geth"]
+    command:
       - --taiko
       - --networkid 167000
       - --gcmode archive
@@ -62,7 +63,7 @@ services:
     volumes:
       - ./jwtsecret:/jwtsecret
     entrypoint: ["taiko-client", "driver"]
-    command: >
+    command:
       - "--l1.ws ${ETHEREUM_MAINNET_EXECUTION_WS}"
       - "--l2.ws ws://taiko-alethia-archive:8545"
       - "--l1.beacon ${ETHEREUM_MAINNET_BEACON_REST}"
diff --git a/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml b/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml
index fba7907f..7258f254 100644
--- a/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml
+++ b/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml
@@ -14,7 +14,8 @@ services:
     ports:
       - "10251:10251"
       - "10251:10251/udp"
-    command: >
+    entrypoint: ["geth"]
+    command:
       - --taiko
       - --networkid 167000
       - --gcmode full
@@ -62,7 +63,7 @@ services:
     volumes:
       - ./jwtsecret:/jwtsecret
     entrypoint: ["taiko-client", "driver"]
-    command: >
+    command:
       - "--l1.ws ${ETHEREUM_MAINNET_EXECUTION_WS}"
       - "--l2.ws ws://taiko-alethia:8545"
       - "--l1.beacon ${ETHEREUM_MAINNET_BEACON_REST}"
diff --git a/taiko/geth/taiko-hekla-geth-archive-leveldb-hash.yml b/taiko/geth/taiko-hekla-geth-archive-leveldb-hash.yml
index e9ad6bd4..63e08e75 100644
--- a/taiko/geth/taiko-hekla-geth-archive-leveldb-hash.yml
+++ b/taiko/geth/taiko-hekla-geth-archive-leveldb-hash.yml
@@ -14,7 +14,8 @@ services:
     ports:
       - "10063:10063"
       - "10063:10063/udp"
-    command: >
+    entrypoint: ["geth"]
+    command:
       - --taiko
       - --networkid 167009
       - --gcmode archive
@@ -62,7 +63,7 @@ services:
     volumes:
       - ./jwtsecret:/jwtsecret
     entrypoint: ["taiko-client", "driver"]
-    command: >
+    command:
       - "--l1.ws ${ETHEREUM_HOLESKY_EXECUTION_WS}"
       - "--l2.ws ws://taiko-hekla-archive:8545"
       - "--l1.beacon ${ETHEREUM_HOLESKY_BEACON_REST}"
diff --git a/taiko/geth/taiko-hekla-geth-pruned-pebble-path.yml b/taiko/geth/taiko-hekla-geth-pruned-pebble-path.yml
index 696903fd..74f36cbb 100644
--- a/taiko/geth/taiko-hekla-geth-pruned-pebble-path.yml
+++ b/taiko/geth/taiko-hekla-geth-pruned-pebble-path.yml
@@ -14,7 +14,8 @@ services:
     ports:
       - "10396:10396"
       - "10396:10396/udp"
-    command: >
+    entrypoint: ["geth"]
+    command:
       - --taiko
       - --networkid 167009
       - --gcmode full
@@ -62,7 +63,7 @@ services:
     volumes:
       - ./jwtsecret:/jwtsecret
     entrypoint: ["taiko-client", "driver"]
-    command: >
+    command:
       - "--l1.ws ${ETHEREUM_HOLESKY_EXECUTION_WS}"
       - "--l2.ws ws://taiko-hekla:8545"
       - "--l1.beacon ${ETHEREUM_HOLESKY_BEACON_REST}"