diff --git a/bitnami/drupal/8/Dockerfile b/bitnami/drupal/8/Dockerfile
index e189c20753af..de46fb587f23 100644
--- a/bitnami/drupal/8/Dockerfile
+++ b/bitnami/drupal/8/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Bitnami <containers@bitnami.com>
 
 ENV BITNAMI_APP_NAME=drupal \
     BITNAMI_IMAGE_VERSION=8.2.7-r1 \
-    PATH=/opt/bitnami/php/bin:/opt/bitnami/drush:/opt/bitnami/mysql/bin/:$PATH
+    PATH=/opt/bitnami/php/bin:/opt/bitnami/drush:/opt/bitnami/mysql/bin/:/opt/bitnami/apache/bin/:$PATH
 
 # System packages required
 RUN install_packages libaprutil1 libapr1 libc6 libuuid1 libexpat1 libssl1.0.0 libpcre3 libldap-2.4-2 libsasl2-2 libgnutls-deb0-28 zlib1g libp11-kit0 libtasn1-6 libnettle4 libhogweed2 libgmp10 libffi6 libxslt1.1 libtidy-0.99-0 libreadline6 libncurses5 libtinfo5 libmcrypt4 libstdc++6 libpng12-0 libjpeg62-turbo libbz2-1.0 libxml2 libcurl3 libfreetype6 libicu52 libgcc1 libgcrypt20 liblzma5 libidn11 librtmp1 libssh2-1 libgssapi-krb5-2 libkrb5-3 libk5crypto3 libcomerr2 libgpg-error0 libkrb5support0 libkeyutils1 libsybdb5 libpq5
@@ -36,4 +36,4 @@ EXPOSE 80 443
 
 ENTRYPOINT ["/app-entrypoint.sh"]
 
-CMD ["nami", "start", "--foreground", "apache"]
+CMD ["/opt/bitnami/apache/bin/httpd"]
diff --git a/bitnami/drupal/8/rootfs/app-entrypoint.sh b/bitnami/drupal/8/rootfs/app-entrypoint.sh
index 8894cd303799..054095659a85 100755
--- a/bitnami/drupal/8/rootfs/app-entrypoint.sh
+++ b/bitnami/drupal/8/rootfs/app-entrypoint.sh
@@ -5,9 +5,15 @@
 print_welcome_page
 check_for_updates &
 
-if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$(basename $1)" == "httpd" ]] || [[ "$1" == "/init.sh" ]]; then
   nami_initialize apache php drupal
-  info "Starting drupal..."
+
+  if [[ "$(basename $1)" == "httpd" ]]; then
+    # drupal initialization leaves a running httpd instance
+    apachectl stop
+
+    set -- "$@" -f /opt/bitnami/apache/conf/httpd.conf -D FOREGROUND
+  fi
 fi
 
 exec tini -- "$@"