diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 32f416c..39d1f2b 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -94,4 +94,4 @@ ENV DEBIAN_FRONTEND="teletype" \
 # Run startup-script
 # 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"]
+CMD ["iob"]
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 6227836..5b335a3 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
+set -e
 
+if [ "$1" = 'iob' ];
+then
 # Reading ENV
 adminport=$IOB_ADMINPORT
 avahi=$AVAHI
@@ -451,7 +454,11 @@ echo ' '
 echo "Starting ioBroker..."
 echo ' '
 
-# gosu iobroker node node_modules/iobroker.js-controller/controller.js
+exec gosu iobroker node node_modules/iobroker.js-controller/controller.js "$@"
+
+fi
+
+exec "$@"
 
 # Preventing container restart by keeping a process alive even if iobroker will be stopped
 # tail -f /dev/null