diff --git a/bitnami/drupal/9/debian-11/Dockerfile b/bitnami/drupal/9/debian-11/Dockerfile
index b87d75126508..5047896825b4 100644
--- a/bitnami/drupal/9/debian-11/Dockerfile
+++ b/bitnami/drupal/9/debian-11/Dockerfile
@@ -1,12 +1,15 @@
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 FROM docker.io/bitnami/minideb:bullseye
 
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-06-20T22:11:34Z" \
+      org.opencontainers.image.created="2023-06-23T22:58:59Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="9.5.9-debian-11-r16" \
+      org.opencontainers.image.ref.name="9.5.9-debian-11-r17" \
       org.opencontainers.image.title="drupal" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="9.5.9"
@@ -22,7 +25,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages acl ca-certificates curl gnupg libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps unzip zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "php-8.1.20-1-linux-${OS_ARCH}-debian-11" \
+      "php-8.1.20-3-linux-${OS_ARCH}-debian-11" \
       "apache-2.4.57-8-linux-${OS_ARCH}-debian-11" \
       "mysql-client-10.11.4-0-linux-${OS_ARCH}-debian-11" \
       "libphp-8.1.20-0-linux-${OS_ARCH}-debian-11" \
diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 68a3389c21b7..777d8a16d26c 100644
--- a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -27,7 +27,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.1.20-1"
+        "version": "8.1.20-3"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh
index 801b9412bd99..eb52f7644785 100644
--- a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -42,7 +42,7 @@ ensure_dir_exists() {
     local owner_user="${2:-}"
     local owner_group="${3:-}"
 
-    mkdir -p "${dir}"
+    [ -d "${dir}" ] || mkdir -p "${dir}"
     if [[ -n $owner_user ]]; then
         owned_by "$dir" "$owner_user" "$owner_group"
     fi