diff --git a/bitnami/drupal/8/debian-10/Dockerfile b/bitnami/drupal/8/debian-10/Dockerfile
index 45cc562fb6c0..d916c304b2ee 100644
--- a/bitnami/drupal/8/debian-10/Dockerfile
+++ b/bitnami/drupal/8/debian-10/Dockerfile
@@ -19,8 +19,8 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "drupal" "8.9.16-
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
-RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
+RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/drupal/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
@@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="drupal" \
-    BITNAMI_IMAGE_VERSION="8.9.16-debian-10-r6" \
+    BITNAMI_IMAGE_VERSION="8.9.16-debian-10-r7" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/drupal/8/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/drupal/8/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 1280134f015c..dc322c377b1b 100644
--- a/bitnami/drupal/8/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/drupal/8/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -177,6 +177,10 @@ web_server_reload() {
 #   --apache-before-vhost-configuration - Configuration to add before the <VirtualHost> directive (no default)
 #   --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no')
 #   --apache-extra-directory-configuration - Extra configuration for the document root directory
+#   --apache-proxy-address - Address where to proxy requests
+#   --apache-proxy-configuration - Extra configuration for the proxy
+#   --apache-proxy-http-configuration - Extra configuration for the proxy HTTP vhost
+#   --apache-proxy-https-configuration - Extra configuration for the proxy HTTPS vhost
 #   --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup
 # NGINX-specific flags:
 #   --nginx-additional-configuration - Additional server block configuration (no default)
@@ -214,6 +218,9 @@ ensure_web_server_app_configuration_exists() {
             | --apache-allow-override \
             | --apache-extra-directory-configuration \
             | --apache-proxy-address \
+            | --apache-proxy-configuration \
+            | --apache-proxy-http-configuration \
+            | --apache-proxy-https-configuration \
             | --apache-move-htaccess \
             )
                 apache_args+=("${1//apache-/}" "${2:?missing value}")
diff --git a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl
index 6c320e3f60e6..23ba583683d2 100644
--- a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl
+++ b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl
@@ -1,5 +1,8 @@
+{{before_vhost_configuration}}
 <VirtualHost {{http_listen_addresses}}>
   ServerAlias *
+  {{proxy_configuration}}
+  {{proxy_http_configuration}}
   ProxyPass / {{proxy_address}}
   ProxyPassReverse / {{proxy_address}}
   {{additional_configuration}}
diff --git a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl
index 2273f610dfad..cb18f5cf77e8 100644
--- a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl
+++ b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl
@@ -1,7 +1,11 @@
+{{before_vhost_configuration}}
 <VirtualHost {{https_listen_addresses}}>
   ServerAlias *
+  SSLEngine on
   SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt"
   SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key"
+  {{proxy_configuration}}
+  {{proxy_https_configuration}}
   ProxyPass / {{proxy_address}}
   ProxyPassReverse / {{proxy_address}}
   {{additional_configuration}}
diff --git a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl
index ffd0e72183c8..7ac08b131680 100644
--- a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl
+++ b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl
@@ -3,6 +3,7 @@
   Options -Indexes +FollowSymLinks -MultiViews
   AllowOverride {{allow_override}}
   {{acl_configuration}}
+  {{proxy_configuration}}
   ProxyPass / {{proxy_address}}
   ProxyPassReverse / {{proxy_address}}
   {{extra_directory_configuration}}
diff --git a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
index 18146f226eeb..3374c0a702c4 100644
--- a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
+++ b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
@@ -330,6 +330,10 @@ EOF
 #   --allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no')
 #   --document-root - Path to document root directory
 #   --extra-directory-configuration - Extra configuration for the document root directory
+#   --proxy-address - Address where to proxy requests
+#   --proxy-configuration - Extra configuration for the proxy
+#   --proxy-http-configuration - Extra configuration for the proxy HTTP vhost
+#   --proxy-https-configuration - Extra configuration for the proxy HTTPS vhost
 # Returns:
 #   true if the configuration was enabled, false otherwise
 ########################
@@ -352,6 +356,9 @@ ensure_apache_app_configuration_exists() {
     export document_root="${BITNAMI_ROOT_DIR}/${app}"
     export extra_directory_configuration=""
     export proxy_address=""
+    export proxy_configuration=""
+    export proxy_http_configuration=""
+    export proxy_https_configuration=""
     # Validate arguments
     shift
     while [[ "$#" -gt 0 ]]; do
@@ -373,6 +380,9 @@ ensure_apache_app_configuration_exists() {
             | --document-root \
             | --extra-directory-configuration \
             | --proxy-address \
+            | --proxy-configuration \
+            | --proxy-http-configuration \
+            | --proxy-https-configuration \
             )
                 var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
                 shift
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index 201278f31ee0..08832009775d 100644
--- a/bitnami/drupal/README.md
+++ b/bitnami/drupal/README.md
@@ -42,7 +42,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`9`, `9-debian-10`, `9.1.9`, `9.1.9-debian-10-r8`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.1.9-debian-10-r8/9/debian-10/Dockerfile)
-* [`8`, `8-debian-10`, `8.9.16`, `8.9.16-debian-10-r6` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.16-debian-10-r6/8/debian-10/Dockerfile)
+* [`8`, `8-debian-10`, `8.9.16`, `8.9.16-debian-10-r7` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.16-debian-10-r7/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).