diff --git a/Dockerfile b/Dockerfile
index dbe0255..8127930 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,8 +13,16 @@ RUN sed -i'' 's/^Listen 80$/Listen 8080/' "/etc/apache2/ports.conf" && \
     mkdir "/var/www/html" && \
     chown "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"
 RUN curl -L "https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" | tar -zx --strip=1
 
+CMD [ "docker-php-entrypoint", "apache2-foreground" ]
+
 HEALTHCHECK --interval="10s" \
     CMD curl --fail "http://localhost:8080" || exit 1