diff --git a/goat/geth/goat-mainnet-geth-archive-leveldb-hash.yml b/goat/geth/goat-mainnet-geth-archive-leveldb-hash.yml
index 27c4a44b..651f0605 100644
--- a/goat/geth/goat-mainnet-geth-archive-leveldb-hash.yml
+++ b/goat/geth/goat-mainnet-geth-archive-leveldb-hash.yml
@@ -44,22 +44,22 @@ services:
     image: ghcr.io/goatnetwork/goat:v0.2.3
     stop_grace_period: 30s
     restart: unless-stopped
-    entrypoint: ["goatd", "start"]
-    ports:
-      - "15891:15891"
-      - "15891:15891/udp"
-    command:
-      - --chain-id goat-mainnet
-      - --goat.geth "/geth/geth.ipc"
-      - --p2p.external-address "${IP}:15891"
-      - --p2p.laddr "0.0.0.0:15891"
     environment:
       - "IP=${IP}"
     volumes:
       - "goat-mainnet-geth-archive-leveldb-hash_node:/root/.goat"
       - "goat-mainnet-geth-archive-leveldb-hash:/geth"
     depends_on:
-      - goat-mainnet-archive
+      - goat-mainnet-archive    
+    ports:
+      - "15891:15891"
+      - "15891:15891/udp"
+    entrypoint: ["goatd", "start"]
+    command: >
+      - --chain-id goat-mainnet
+      - --goat.geth "/geth/geth.ipc"
+      - --p2p.external-address "${IP}:15891"
+      - --p2p.laddr "0.0.0.0:15891"
     networks:
       - chains
 
diff --git a/goat/geth/goat-mainnet-geth-pruned-pebble-path.yml b/goat/geth/goat-mainnet-geth-pruned-pebble-path.yml
index ff735db4..e6206993 100644
--- a/goat/geth/goat-mainnet-geth-pruned-pebble-path.yml
+++ b/goat/geth/goat-mainnet-geth-pruned-pebble-path.yml
@@ -44,22 +44,22 @@ services:
     image: ghcr.io/goatnetwork/goat:v0.2.3
     stop_grace_period: 30s
     restart: unless-stopped
-    entrypoint: ["goatd", "start"]
-    ports:
-      - "15640:15640"
-      - "15640:15640/udp"
-    command:
-      - --chain-id goat-mainnet
-      - --goat.geth "/geth/geth.ipc"
-      - --p2p.external-address "${IP}:15640"
-      - --p2p.laddr "0.0.0.0:15640"
     environment:
       - "IP=${IP}"
     volumes:
       - "goat-mainnet-geth-pruned-pebble-path_node:/root/.goat"
       - "goat-mainnet-geth-pruned-pebble-path:/geth"
     depends_on:
-      - goat-mainnet
+      - goat-mainnet    
+    ports:
+      - "15640:15640"
+      - "15640:15640/udp"
+    entrypoint: ["goatd", "start"]
+    command: >
+      - --chain-id goat-mainnet
+      - --goat.geth "/geth/geth.ipc"
+      - --p2p.external-address "${IP}:15640"
+      - --p2p.laddr "0.0.0.0:15640"
     networks:
       - chains
 
diff --git a/goat/geth/goat-testnet3-geth-archive-leveldb-hash.yml b/goat/geth/goat-testnet3-geth-archive-leveldb-hash.yml
index d94ff79e..94192353 100644
--- a/goat/geth/goat-testnet3-geth-archive-leveldb-hash.yml
+++ b/goat/geth/goat-testnet3-geth-archive-leveldb-hash.yml
@@ -44,22 +44,22 @@ services:
     image: ghcr.io/goatnetwork/goat:v0.2.3
     stop_grace_period: 30s
     restart: unless-stopped
-    entrypoint: ["goatd", "start"]
-    ports:
-      - "15461:15461"
-      - "15461:15461/udp"
-    command:
-      - --chain-id goat-testnet3
-      - --goat.geth "/geth/geth.ipc"
-      - --p2p.external-address "${IP}:15461"
-      - --p2p.laddr "0.0.0.0:15461"
     environment:
       - "IP=${IP}"
     volumes:
       - "goat-testnet3-geth-archive-leveldb-hash_node:/root/.goat"
       - "goat-testnet3-geth-archive-leveldb-hash:/geth"
     depends_on:
-      - goat-testnet3-archive
+      - goat-testnet3-archive    
+    ports:
+      - "15461:15461"
+      - "15461:15461/udp"
+    entrypoint: ["goatd", "start"]
+    command: >
+      - --chain-id goat-testnet3
+      - --goat.geth "/geth/geth.ipc"
+      - --p2p.external-address "${IP}:15461"
+      - --p2p.laddr "0.0.0.0:15461"
     networks:
       - chains
 
diff --git a/goat/geth/goat-testnet3-geth-pruned-pebble-path.yml b/goat/geth/goat-testnet3-geth-pruned-pebble-path.yml
index 15054cbd..65645b2b 100644
--- a/goat/geth/goat-testnet3-geth-pruned-pebble-path.yml
+++ b/goat/geth/goat-testnet3-geth-pruned-pebble-path.yml
@@ -44,22 +44,22 @@ services:
     image: ghcr.io/goatnetwork/goat:v0.2.3
     stop_grace_period: 30s
     restart: unless-stopped
-    entrypoint: ["goatd", "start"]
-    ports:
-      - "15272:15272"
-      - "15272:15272/udp"
-    command:
-      - --chain-id goat-testnet3
-      - --goat.geth "/geth/geth.ipc"
-      - --p2p.external-address "${IP}:15272"
-      - --p2p.laddr "0.0.0.0:15272"
     environment:
       - "IP=${IP}"
     volumes:
       - "goat-testnet3-geth-pruned-pebble-path_node:/root/.goat"
       - "goat-testnet3-geth-pruned-pebble-path:/geth"
     depends_on:
-      - goat-testnet3
+      - goat-testnet3    
+    ports:
+      - "15272:15272"
+      - "15272:15272/udp"
+    entrypoint: ["goatd", "start"]
+    command: >
+      - --chain-id goat-testnet3
+      - --goat.geth "/geth/geth.ipc"
+      - --p2p.external-address "${IP}:15272"
+      - --p2p.laddr "0.0.0.0:15272"
     networks:
       - chains