diff --git a/Dockerfile b/Dockerfile
index 7f1965d..24ec9d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,15 @@ RUN sed -i'' 's/^Listen 80$/Listen 8080/' "/etc/apache2/ports.conf" && \
 
 RUN chown -R "www-data":"www-data" "/var/www/html"
 
+# Add Tini
+ENV "TINI_VERSION" "v0.16.1"
+ADD "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" "/tini"
+RUN chmod +x "/tini"
+ENTRYPOINT ["/tini", "--"]
+
 USER "www-data"
 
-HEALTHCHECK --interval=10s \
+CMD [ "docker-php-entrypoint", "apache2-foreground" ]
+
+HEALTHCHECK --interval="10s" \
     CMD curl --fail "http://localhost:8080" || exit 1