diff --git a/bitnami/drupal/8/debian-10/Dockerfile b/bitnami/drupal/8/debian-10/Dockerfile
index 407f07663924..cf3fab206279 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.15-
 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
@@ -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.15-debian-10-r11" \
+    BITNAMI_IMAGE_VERSION="8.9.15-debian-10-r12" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index d89be47282f2..43979b4d54e1 100644
--- a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -398,10 +398,27 @@ wait_for_mysql_access() {
 #   None
 #########################
 mysql_stop() {
+    local -r retries=25
+    local -r sleep_time=5
+
+    are_db_files_locked() {
+        local return_value=0
+        read -r -a db_files <<< "$(find "$DB_DATA_DIR" -regex "^.*ibdata[0-9]+" -print0 -o -regex "^.*ib_logfile[0-9]+" -print0 | xargs -0)"
+        for f in "${db_files[@]}"; do
+            debug_execute lsof -w "$f" && return_value=1
+        done
+        return $return_value
+    }
+
     ! is_mysql_running && return
 
     info "Stopping $DB_FLAVOR"
     stop_service_using_pid "$DB_PID_FILE"
+    debug "Waiting for $DB_FLAVOR to unlock db files"
+    if ! retry_while are_db_files_locked "$retries" "$sleep_time"; then
+        error "$DB_FLAVOR failed to stop"
+        return 1
+    fi
 }
 
 ########################
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index 3a914a25aa30..4e9b3a248102 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.8`, `9.1.8-debian-10-r11`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.1.8-debian-10-r11/9/debian-10/Dockerfile)
-* [`8`, `8-debian-10`, `8.9.15`, `8.9.15-debian-10-r11` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.15-debian-10-r11/8/debian-10/Dockerfile)
+* [`8`, `8-debian-10`, `8.9.15`, `8.9.15-debian-10-r12` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.15-debian-10-r12/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).