diff --git a/bitnami/drupal-nginx/9/debian-10/Dockerfile b/bitnami/drupal-nginx/9/debian-10/Dockerfile
index 30d62ee14d5b..1e16c1b4b988 100644
--- a/bitnami/drupal-nginx/9/debian-10/Dockerfile
+++ b/bitnami/drupal-nginx/9/debian-10/Dockerfile
@@ -20,14 +20,13 @@ 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/nginx/postunpack.sh
+RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/nginx-php-fpm/postunpack.sh
 RUN /opt/bitnami/scripts/drupal/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
 ENV APP_VERSION="9.3.9" \
     BITNAMI_APP_NAME="drupal-nginx" \
-    BITNAMI_IMAGE_VERSION="9.3.9-debian-10-r14" \
     NGINX_HTTPS_PORT_NUMBER="" \
     NGINX_HTTP_PORT_NUMBER="" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/nginx/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/drupal/vendor/bin:$PATH"
diff --git a/bitnami/drupal-nginx/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/drupal-nginx/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index fee929c4ee1a..bd3d43db6e43 100644
--- a/bitnami/drupal-nginx/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/drupal-nginx/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -132,10 +132,14 @@ mysql_client_initialize() {
 #   None
 #########################
 mysql_client_wrap_binary_for_ssl() {
-    local -r wrapper_file="${DB_BIN_DIR}/mysql"
+    local wrapper_file="${DB_BIN_DIR}/mysql"
+    # In MySQL Client 10.6, mysql is a link to the mariadb binary
+    if [[ -f "${DB_BIN_DIR}/mariadb" ]]; then
+        wrapper_file="${DB_BIN_DIR}/mariadb"
+    fi
     local -r wrapped_binary_file="${DB_BASE_DIR}/.bin/mysql"
     local -a ssl_opts=()
-    read -r -a ssl_opts <<< "$(mysql_client_extra_opts)"
+    read -r -a ssl_opts <<<"$(mysql_client_extra_opts)"
 
     mv "$wrapper_file" "$wrapped_binary_file"
     cat >"$wrapper_file" <<EOF
diff --git a/bitnami/drupal-nginx/README.md b/bitnami/drupal-nginx/README.md
index 2fb8d7c1fae9..d682ce0b6007 100644
--- a/bitnami/drupal-nginx/README.md
+++ b/bitnami/drupal-nginx/README.md
@@ -37,7 +37,7 @@ Non-root container images add an extra layer of security and are generally recom
 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-r14`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.3.9-debian-10-r14/9/debian-10/Dockerfile)
+* [`9`, `9-debian-10`, `9.3.9`, `9.3.9-debian-10-r15`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.3.9-debian-10-r15/9/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal-nginx GitHub repo](https://github.com/bitnami/bitnami-docker-drupal-nginx).