diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 55f9309..32f416c 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -92,4 +92,6 @@ ENV DEBIAN_FRONTEND="teletype" \
     TZ="Europe/Berlin"
 
 # Run startup-script
-ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
+# ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
+ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"]
+CMD ["gosu iobroker node node_modules/iobroker.js-controller/controller.js"]
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index ca1d5f1..6227836 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -451,7 +451,7 @@ echo ' '
 echo "Starting ioBroker..."
 echo ' '
 
-gosu iobroker node node_modules/iobroker.js-controller/controller.js
+# gosu iobroker node node_modules/iobroker.js-controller/controller.js
 
 # Preventing container restart by keeping a process alive even if iobroker will be stopped
-tail -f /dev/null
+# tail -f /dev/null