diff --git a/Dockerfile.m4 b/Dockerfile.m4
index 27909a0..e1abef2 100644
--- a/Dockerfile.m4
+++ b/Dockerfile.m4
@@ -479,5 +479,4 @@ EXPOSE 3322/tcp
 # Expose RDP port
 EXPOSE 3389/tcp
 
-ENTRYPOINT ["/usr/bin/tini", "--"]
-CMD ["/usr/local/bin/container-foreground-cmd"]
+ENTRYPOINT ["/usr/local/bin/container-init"]
diff --git a/scripts/bin/container-foreground-cmd b/scripts/bin/container-init
similarity index 98%
rename from scripts/bin/container-foreground-cmd
rename to scripts/bin/container-init
index 2b9b27a..c082d45 100755
--- a/scripts/bin/container-foreground-cmd
+++ b/scripts/bin/container-init
@@ -86,4 +86,4 @@ if [ -e /run/dbus/pid ]; then
 fi
 
 # Start all services
-exec runsvdir -P /etc/service/
+exec tini -- runsvdir -P /etc/service/