diff --git a/bitnami/drupal/Dockerfile b/bitnami/drupal/Dockerfile
index e2d3141604cc..e4fa7ef44248 100644
--- a/bitnami/drupal/Dockerfile
+++ b/bitnami/drupal/Dockerfile
@@ -21,6 +21,15 @@ RUN bitnami-pkg unpack drupal-8.2.6-0 --checksum a8f874db6aef1e4dae22b2fd88e700b
 
 COPY rootfs /
 
+ENV APACHE_HTTP_PORT="80" \
+    APACHE_HTTPS_PORT="443" \
+    DRUPAL_USERNAME="user" \
+    DRUPAL_PASSWORD="bitnami" \
+    DRUPAL_EMAIL="user@example.com" \
+    MARIADB_USER="root" \
+    MARIADB_HOST="mariadb" \
+    MARIADB_PORT="3306"
+
 VOLUME ["/bitnami/drupal", "/bitnami/apache", "/bitnami/php"]
 
 EXPOSE 80 443
diff --git a/bitnami/drupal/rootfs/app-entrypoint.sh b/bitnami/drupal/rootfs/app-entrypoint.sh
index c4e4812a42f1..f49ae60e0501 100755
--- a/bitnami/drupal/rootfs/app-entrypoint.sh
+++ b/bitnami/drupal/rootfs/app-entrypoint.sh
@@ -13,16 +13,6 @@ function initialize {
     fi
 }
 
-# Set default values
-export APACHE_HTTP_PORT=${APACHE_HTTP_PORT:-"80"}
-export APACHE_HTTPS_PORT=${APACHE_HTTPS_PORT:-"443"}
-export DRUPAL_USERNAME=${DRUPAL_USERNAME:-"user"}
-export DRUPAL_PASSWORD=${DRUPAL_PASSWORD:-"bitnami"}
-export DRUPAL_EMAIL=${DRUPAL_EMAIL:-"user@example.com"}
-export MARIADB_USER=${MARIADB_USER:-"root"}
-export MARIADB_HOST=${MARIADB_HOST:-"mariadb"}
-export MARIADB_PORT=${MARIADB_PORT:-"3306"}
-
 if [[ "$1" == "nami" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
    for module in apache php drupal; do
     initialize $module