diff --git a/goat/mainnet/node-entrypoint.sh b/goat/mainnet/node-entrypoint.sh
index 6241a0a3..f03c9a24 100755
--- a/goat/mainnet/node-entrypoint.sh
+++ b/goat/mainnet/node-entrypoint.sh
@@ -6,7 +6,7 @@ echo "Starting initialization steps..."
 # Check if the genesis.json file exists; if not, initialize and copy it
 if [ ! -f /goat/config/genesis.json ]; then
     echo "Initializing goatd..."
-    goatd init --home /goat mainnet
+    exec goatd init --home /goat mainnet
     echo "Copying genesis file..."
     cp /genesis/goat.json /goat/config/genesis.json
 else
@@ -14,4 +14,4 @@ else
 fi
 
 # Pass control to the final command specified in docker-compose.yml
-goatd start --home /goat --chain-id=goat-mainnet --goat.geth /geth/geth.ipc --api.enable --api.address=tcp://0.0.0.0:1317 --p2p.external-address $IP:40258 --p2p.laddr 0.0.0.0:40258
+exec goatd start --home /goat --chain-id=goat-mainnet --goat.geth /geth/geth.ipc --api.enable --api.address=tcp://0.0.0.0:1317 --p2p.external-address $IP:40258 --p2p.laddr 0.0.0.0:40258