diff --git a/bitnami/solr/9/debian-11/Dockerfile b/bitnami/solr/9/debian-11/Dockerfile
index 5666003b6807c..ae0541ee61b7f 100644
--- a/bitnami/solr/9/debian-11/Dockerfile
+++ b/bitnami/solr/9/debian-11/Dockerfile
@@ -8,10 +8,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-11-16T14:19:53Z" \
+      org.opencontainers.image.created="2023-12-02T08:21:00Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="9.4.0-debian-11-r1" \
+      org.opencontainers.image.ref.name="9.4.0-debian-11-r2" \
       org.opencontainers.image.title="solr" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="9.4.0"
@@ -22,21 +22,21 @@ ENV HOME="/" \
     OS_NAME="linux"
 
 COPY prebuildfs /
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl lsof netcat-openbsd procps zlib1g
-RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "java-17.0.9-11-1-linux-${OS_ARCH}-debian-11" \
+      "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \
       "solr-9.4.0-0-linux-${OS_ARCH}-debian-11" \
-    ) && \
+    ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
         curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \
         curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \
-      fi && \
-      sha256sum -c "${COMPONENT}.tar.gz.sha256" && \
-      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+      fi ; \
+      sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \
+      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \
       rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
     done
 RUN apt-get update && apt-get upgrade -y && \
diff --git a/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 4702d3de52f7b..d7031b46dc0e9 100644
--- a/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "17.0.9-11-1"
+        "version": "17.0.9-11-6"
     },
     "solr": {
         "arch": "amd64",
diff --git a/bitnami/solr/9/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/solr/9/debian-11/prebuildfs/usr/sbin/run-script
index 4ca0f897277eb..b7a5bf1e50bff 100755
--- a/bitnami/solr/9/debian-11/prebuildfs/usr/sbin/run-script
+++ b/bitnami/solr/9/debian-11/prebuildfs/usr/sbin/run-script
@@ -10,7 +10,7 @@ fi
 
 script=$1
 exit_code="${2:-96}"
-fail_if_not_present="${3:-n}"
+fail_if_not_present="${3:-y}"
 
 if test -f "$script"; then
   sh $script