diff --git a/bitnami/drupal-nginx/9/debian-10/Dockerfile b/bitnami/drupal-nginx/9/debian-10/Dockerfile
index 290535a53a53..cab819380927 100644
--- a/bitnami/drupal-nginx/9/debian-10/Dockerfile
+++ b/bitnami/drupal-nginx/9/debian-10/Dockerfile
@@ -26,7 +26,7 @@ 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 BITNAMI_APP_NAME="drupal-nginx" \
-    BITNAMI_IMAGE_VERSION="9.3.6-debian-10-r7" \
+    BITNAMI_IMAGE_VERSION="9.3.6-debian-10-r8" \
     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/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index 1b504b1df458..21b964ff1cf4 100644
--- a/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -74,8 +74,9 @@ is_dir_empty() {
 #   boolean
 #########################
 is_mounted_dir_empty() {
-    local dir="${1:?missing directory}"
-
+    local -r path="${1:?missing directory}"
+    # Calculate real path in order to avoid issues with symlinks
+    local -r dir="$(realpath "$path")"
     if is_dir_empty "$dir" || find "$dir" -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" -exec false {} +; then
         true
     else
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 d16e036df0a4..9609635e63a3 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
@@ -929,12 +929,17 @@ mysql_conf_set() {
     local -r key="${1:?key missing}"
     local -r value="${2:?value missing}"
     read -r -a sections <<<"${3:-mysqld}"
-    local -r file="${4:-"$DB_CONF_FILE"}"
+    local -r ignore_inline_comments="${4:-no}"
+    local -r file="${5:-"$DB_CONF_FILE"}"
     info "Setting ${key} option"
     debug "Setting ${key} to '${value}' in ${DB_FLAVOR} configuration file ${file}"
     # Check if the configuration exists in the file
     for section in "${sections[@]}"; do
-        ini-file set --section "$section" --key "$key" --value "$value" "$file"
+        if is_boolean_yes "$ignore_inline_comments"; then
+            ini-file set --ignore-inline-comments --section "$section" --key "$key" --value "$value" "$file"
+        else
+            ini-file set --section "$section" --key "$key" --value "$value" "$file"
+        fi
     done
 }
 
diff --git a/bitnami/drupal-nginx/README.md b/bitnami/drupal-nginx/README.md
index 9dda02fcd0c1..9f7bbe5a212e 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.6`, `9.3.6-debian-10-r7`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.3.6-debian-10-r7/9/debian-10/Dockerfile)
+* [`9`, `9-debian-10`, `9.3.6`, `9.3.6-debian-10-r8`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.3.6-debian-10-r8/9/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal-nginx GitHub repo](https://github.com/bitnami/bitnami-docker-drupal-nginx).