diff --git a/bitnami/drupal/9/debian-10/Dockerfile b/bitnami/drupal/9/debian-10/Dockerfile
index 5ed188218d68..782200f88e83 100644
--- a/bitnami/drupal/9/debian-10/Dockerfile
+++ b/bitnami/drupal/9/debian-10/Dockerfile
@@ -21,15 +21,15 @@ 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
 ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="drupal" \
-    BITNAMI_IMAGE_VERSION="9.3.6-debian-10-r14" \
+    BITNAMI_IMAGE_VERSION="9.3.6-debian-10-r15" \
     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/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index 9609635e63a3..fee929c4ee1a 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -241,10 +241,16 @@ mysql_execute_print_output() {
     [[ "${#extra_opts[@]}" -gt 0 ]] && args+=("${extra_opts[@]}")
 
     # Obtain the command specified via stdin
-    local mysql_cmd
-    mysql_cmd="$(</dev/stdin)"
-    debug "Executing SQL command:\n$mysql_cmd"
-    "$DB_BIN_DIR/mysql" "${args[@]}" <<<"$mysql_cmd"
+    if [[ "${BITNAMI_DEBUG:-false}" = true ]]; then
+        local mysql_cmd
+        mysql_cmd="$(</dev/stdin)"
+        debug "Executing SQL command:\n$mysql_cmd"
+        "$DB_BIN_DIR/mysql" "${args[@]}" <<<"$mysql_cmd"
+    else
+        # Do not store the command(s) as a variable, to avoid issues when importing large files
+        # https://github.com/bitnami/bitnami-docker-mariadb/issues/251
+        "$DB_BIN_DIR/mysql" "${args[@]}"
+    fi
 }
 
 ########################
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index a66a47703ae6..e068323f8f11 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.6`, `9.3.6-debian-10-r14`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.3.6-debian-10-r14/9/debian-10/Dockerfile)
+* [`9`, `9-debian-10`, `9.3.6`, `9.3.6-debian-10-r15`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.3.6-debian-10-r15/9/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).