diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
index e2601944..c5534a50 100644
--- a/Dockerfile.amd64
+++ b/Dockerfile.amd64
@@ -38,4 +38,4 @@ ENV SUPERVISOR_IMAGE resin/amd64-supervisor
 ENV CONFIG_MOUNT_POINT /boot/config.json
 ENV LED_FILE /dev/null
 
-CMD ["/app/entry.sh"]
+ENTRYPOINT ["/app/entry.sh"]
diff --git a/Dockerfile.armv7hf b/Dockerfile.armv7hf
index d6c2c99d..2d1e65e3 100644
--- a/Dockerfile.armv7hf
+++ b/Dockerfile.armv7hf
@@ -38,4 +38,4 @@ ENV SUPERVISOR_IMAGE resin/armv7hf-supervisor
 ENV CONFIG_MOUNT_POINT /boot/config.json
 ENV LED_FILE /dev/null
 
-CMD ["/app/entry.sh"]
+ENTRYPOINT ["/app/entry.sh"]
diff --git a/Dockerfile.i386 b/Dockerfile.i386
index a69dc6f6..a617f0e4 100644
--- a/Dockerfile.i386
+++ b/Dockerfile.i386
@@ -38,4 +38,4 @@ ENV SUPERVISOR_IMAGE resin/i386-supervisor
 ENV CONFIG_MOUNT_POINT /boot/config.json
 ENV LED_FILE /dev/null
 
-CMD ["/app/entry.sh"]
+ENTRYPOINT ["/app/entry.sh"]
diff --git a/Dockerfile.rpi b/Dockerfile.rpi
index 1809efb9..4e00cdbe 100644
--- a/Dockerfile.rpi
+++ b/Dockerfile.rpi
@@ -34,4 +34,4 @@ RUN chmod +x /app/src/enterContainer.sh \
 
 RUN chmod +x /app/bin/gosuper
 
-CMD ["/app/entry.sh"]
+ENTRYPOINT ["/app/entry.sh"]