diff --git a/bitnami/apache/Dockerfile b/bitnami/apache/Dockerfile
index 1033f906647d..b368a6b5e2f7 100644
--- a/bitnami/apache/Dockerfile
+++ b/bitnami/apache/Dockerfile
@@ -14,4 +14,4 @@ COPY rootfs/ /
 
 EXPOSE 80 443
 VOLUME ["$BITNAMI_APP_VOL_PREFIX/conf", "$BITNAMI_APP_VOL_PREFIX/logs", "/app"]
-ENTRYPOINT ["/init"]
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/bitnami/apache/rootfs/entrypoint.sh b/bitnami/apache/rootfs/entrypoint.sh
new file mode 100755
index 000000000000..fa7f178cdbd9
--- /dev/null
+++ b/bitnami/apache/rootfs/entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ -n "${1}" ]; then
+  touch /etc/services.d/$BITNAMI_APP_NAME/down
+fi
+
+exec /init "$@"