diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 6f064be830..95784ebf9c 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -4,13 +4,14 @@ set -e
 
 if [ "$1" = 'celestia' ]; then
     echo "Initializing Celestia Node with command:"
-
+    COMMAND="celestia "${NODE_TYPE}" init --p2p.network "${P2P_NETWORK}" --rpc.addr="0.0.0.0" --gateway.addr="0.0.0.0""
     if [[ -n "$NODE_STORE" ]]; then
-        echo "celestia "${NODE_TYPE}" init --p2p.network "${P2P_NETWORK}" --node.store "${NODE_STORE}""
-        celestia "${NODE_TYPE}" init --p2p.network "${P2P_NETWORK}" --node.store "${NODE_STORE}"
+        COMMAND=${COMMAND}" --node.store "${NODE_STORE}""
+        echo $COMMAND
+        $COMMAND
     else
-        echo "celestia "${NODE_TYPE}" init --p2p.network "${P2P_NETWORK}""
-        celestia "${NODE_TYPE}" init --p2p.network "${P2P_NETWORK}"
+        echo $COMMAND
+        $COMMAND
     fi
 
     echo ""