diff --git a/Dockerfile b/Dockerfile
index e6a92b2a6..47cf9a78b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,5 +50,5 @@ RUN mkdir -p $IPFS_CLUSTER_PATH && \
 VOLUME $IPFS_CLUSTER_PATH
 ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/entrypoint.sh"]
 
-# Defaults for ipfs-cluster-service would go here
-CMD []
+# Defaults for ipfs-cluster-service go here
+CMD ["daemon", "--upgrade"]
diff --git a/Dockerfile-bundle b/Dockerfile-bundle
index ad34bdfb8..e828bd083 100644
--- a/Dockerfile-bundle
+++ b/Dockerfile-bundle
@@ -37,5 +37,5 @@ RUN mkdir -p $IPFS_CLUSTER_PATH && \
 VOLUME $IPFS_CLUSTER_PATH
 ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/start-daemons.sh"]
 
-# Defaults for ipfs-cluster-service would go here
-CMD []
+# Defaults for ipfs-cluster-service go here
+CMD ["daemon", "--upgrade"]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index d356f5df1..f72739248 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -20,10 +20,15 @@ ipfs-cluster-service --version
 if [ -e "${IPFS_CLUSTER_PATH}/service.json" ]; then
     echo "Found IPFS cluster configuration at ${IPFS_CLUSTER_PATH}"
 else
+    echo "This container only runs ipfs-cluster-service. ipfs needs to be run separately!"
+    echo "Initializing default configuration"
     ipfs-cluster-service init
     if [ -n "$IPFS_API" ]; then
+        echo "Using \$IPFS_API as value for ipfs_connector.ipfshttp.node_multiaddress in configuration"
         sed -i "s;/ip4/127\.0\.0\.1/tcp/5001;$IPFS_API;" "${IPFS_CLUSTER_PATH}/service.json"
     fi
+
+    echo "Warning: By default, the API and Proxy endpoints will listen on 0.0.0.0!"
     sed -i 's;127\.0\.0\.1/tcp/9094;0.0.0.0/tcp/9094;' "${IPFS_CLUSTER_PATH}/service.json"
     sed -i 's;127\.0\.0\.1/tcp/9095;0.0.0.0/tcp/9095;' "${IPFS_CLUSTER_PATH}/service.json"
 fi