diff --git a/bitnami/drupal/9/debian-10/Dockerfile b/bitnami/drupal/9/debian-10/Dockerfile
index f7b2309a1123..92b1f9350d3c 100644
--- a/bitnami/drupal/9/debian-10/Dockerfile
+++ b/bitnami/drupal/9/debian-10/Dockerfile
@@ -21,8 +21,8 @@ RUN apt-get update && apt-get upgrade -y && \
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
-RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache/postunpack.sh
+RUN /opt/bitnami/scripts/php/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
@@ -30,7 +30,7 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     APP_VERSION="9.3.9" \
     BITNAMI_APP_NAME="drupal" \
-    BITNAMI_IMAGE_VERSION="9.3.9-debian-10-r3" \
+    BITNAMI_IMAGE_VERSION="9.3.9-debian-10-r4" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/drupal/vendor/bin:$PATH"
 
 EXPOSE 8080 8443
diff --git a/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 503650210583..818c2158032b 100644
--- a/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -392,10 +392,6 @@ web_server_update_app_configuration() {
             --hosts \
             | --server-name \
             | --server-aliases \
-            | --enable-http \
-            | --enable-https \
-            | --disable-http \
-            | --disable-https \
             | --http-port \
             | --https-port \
             )
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
index ccbd724cb02f..d2e75906b076 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
@@ -9,6 +9,7 @@
 # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata)
 
 # Load logging library
+# shellcheck disable=SC1090,SC1091
 . /opt/bitnami/scripts/liblog.sh
 
 export BITNAMI_ROOT_DIR="/opt/bitnami"
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh
index 872cbeec65a3..f9bca78b4d17 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh
@@ -9,6 +9,7 @@
 # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata)
 
 # Load logging library
+# shellcheck disable=SC1090,SC1091
 . /opt/bitnami/scripts/liblog.sh
 
 export BITNAMI_ROOT_DIR="/opt/bitnami"
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
index 2a6b3c70deed..0aeb9a906755 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
@@ -400,7 +400,7 @@ ensure_apache_app_configuration_exists() {
             | --server-aliases)
                 var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
                 shift
-                read -r -a "$var_name" <<< "$1"
+                read -r -a "${var_name?}" <<< "$1"
                 ;;
             --disable \
             | --disable-http \
@@ -467,7 +467,7 @@ ensure_apache_app_configuration_exists() {
         allow_override="None"
         htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\""
     else
-        allow_override="$allow_override"
+        # allow_override is already set to the expected value
         htaccess_include=""
     fi
     # ACL configuration
@@ -609,7 +609,7 @@ ensure_apache_prefix_configuration_exists() {
         allow_override="None"
         htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\""
     else
-        allow_override="$allow_override"
+        # allow_override is already set to the expected value
         htaccess_include=""
     fi
     # ACL configuration
@@ -694,14 +694,18 @@ apache_update_app_configuration() {
             | --server-aliases)
                 var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
                 shift
-                read -r -a "$var_name" <<< "$1"
+                read -r -a "${var_name?}" <<< "$1"
                 ;;
             # Common flags
-            --server-name \
-            | --enable-http \
+            --enable-http \
             | --enable-https \
             | --disable-http \
             | --disable-https \
+            )
+                var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
+                declare "${var_name}=yes"
+                ;;
+            --server-name \
             | --http-port \
             | --https-port \
             )
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
index defd9bf6d4d5..26fdf9e8e050 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
@@ -9,6 +9,7 @@
 # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata)
 
 # Load logging library
+# shellcheck disable=SC1090,SC1091
 . /opt/bitnami/scripts/liblog.sh
 
 export BITNAMI_ROOT_DIR="/opt/bitnami"
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
index fc940ac44ee8..4de618688f75 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
@@ -9,6 +9,7 @@
 # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata)
 
 # Load logging library
+# shellcheck disable=SC1090,SC1091
 . /opt/bitnami/scripts/liblog.sh
 
 export BITNAMI_ROOT_DIR="/opt/bitnami"
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index c6511a09dcbc..9feb639c5b41 100644
--- a/bitnami/drupal/README.md
+++ b/bitnami/drupal/README.md
@@ -43,7 +43,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`9`, `9-debian-10`, `9.3.9`, `9.3.9-debian-10-r3`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.3.9-debian-10-r3/9/debian-10/Dockerfile)
+* [`9`, `9-debian-10`, `9.3.9`, `9.3.9-debian-10-r4`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.3.9-debian-10-r4/9/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).