diff --git a/bitnami/drupal/9/debian-10/Dockerfile b/bitnami/drupal/9/debian-10/Dockerfile
index 68ad99b0b5c9..f6dce0238abd 100644
--- a/bitnami/drupal/9/debian-10/Dockerfile
+++ b/bitnami/drupal/9/debian-10/Dockerfile
@@ -26,7 +26,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="443" \
     APACHE_HTTP_PORT_NUMBER="80" \
     BITNAMI_APP_NAME="drupal" \
-    BITNAMI_IMAGE_VERSION="9.0.1-debian-10-r6" \
+    BITNAMI_IMAGE_VERSION="9.0.1-debian-10-r7" \
     DRUPAL_DATABASE_NAME="bitnami_drupal" \
     DRUPAL_DATABASE_PASSWORD="" \
     DRUPAL_DATABASE_USER="bn_drupal" \
diff --git a/bitnami/drupal/9/debian-10/rootfs/post-init.sh b/bitnami/drupal/9/debian-10/rootfs/post-init.sh
index e399b62ca90f..9c04107e0984 100755
--- a/bitnami/drupal/9/debian-10/rootfs/post-init.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/post-init.sh
@@ -8,16 +8,16 @@ set -o pipefail
 # set -o xtrace # Uncomment this line for debugging purposes
 
 # Only execute init scripts once
-[[ -f "/bitnami/drupal/.user_scripts_initialized" ]] && exit
-
-read -r -a init_scripts <<< "$(find "/docker-entrypoint-init.d" -type f -print0 | xargs -0)"
-if [[ "${#init_scripts[@]}" -gt 0 ]] && [[ ! -f "/bitnami/drupal/.user_scripts_initialized" ]]; then
-    mkdir -p "/bitnami/drupal"
-    for init_script in "${init_scripts[@]}"; do
-        for init_script_type_handler in /post-init.d/*.sh; do
-            "$init_script_type_handler" "$init_script"
+if [[ ! -f "/bitnami/drupal/.user_scripts_initialized" && -d "/docker-entrypoint-init.d" ]]; then
+    read -r -a init_scripts <<< "$(find "/docker-entrypoint-init.d" -type f -print0 | xargs -0)"
+    if [[ "${#init_scripts[@]}" -gt 0 ]] && [[ ! -f "/bitnami/drupal/.user_scripts_initialized" ]]; then
+        mkdir -p "/bitnami/drupal"
+        for init_script in "${init_scripts[@]}"; do
+            for init_script_type_handler in /post-init.d/*.sh; do
+                "$init_script_type_handler" "$init_script"
+            done
         done
-    done
-fi
+    fi
 
-touch "/bitnami/drupal/.user_scripts_initialized"
+    touch "/bitnami/drupal/.user_scripts_initialized"
+fi
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index 561175831f6f..e2f691018831 100644
--- a/bitnami/drupal/README.md
+++ b/bitnami/drupal/README.md
@@ -36,7 +36,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-debian-10`, `9.0.1-debian-10-r6`, `9`, `9.0.1`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.0.1-debian-10-r6/9/debian-10/Dockerfile)
+* [`9-debian-10`, `9.0.1-debian-10-r7`, `9`, `9.0.1`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.0.1-debian-10-r7/9/debian-10/Dockerfile)
 * [`8-debian-10`, `8.9.1-debian-10-r6`, `8`, `8.9.1` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.1-debian-10-r6/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).