diff --git a/bitnami/solr/8/debian-11/Dockerfile b/bitnami/solr/8/debian-11/Dockerfile
index d4f8e3bf1ba97..77c016072e616 100644
--- a/bitnami/solr/8/debian-11/Dockerfile
+++ b/bitnami/solr/8/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-15T15:48:58Z" \
+      org.opencontainers.image.created="2023-12-02T07:56:09Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.11.2-debian-11-r212" \
+      org.opencontainers.image.ref.name="8.11.2-debian-11-r213" \
       org.opencontainers.image.title="solr" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.11.2"
@@ -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-8.11.2-16-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/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 3e01786afd639..8615b94156004 100644
--- a/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/solr/8/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/8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/solr/8/debian-11/prebuildfs/usr/sbin/run-script
index 4ca0f897277eb..b7a5bf1e50bff 100755
--- a/bitnami/solr/8/debian-11/prebuildfs/usr/sbin/run-script
+++ b/bitnami/solr/8/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
diff --git a/bitnami/solr/README.md b/bitnami/solr/README.md
index 2ee8134327657..d84fbba251409 100644
--- a/bitnami/solr/README.md
+++ b/bitnami/solr/README.md
@@ -1,4 +1,4 @@
-# Apache Solr packaged by Bitnami
+# Bitnami package for Apache Solr
 
 ## What is Apache Solr?
 
@@ -27,7 +27,7 @@ You can find the available configuration options in the [Environment Variables](
 * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems.
 * With Bitnami images the latest bug fixes and features are available as soon as possible.
 * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs.
-* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution.
+* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-.
 * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images.
 * Bitnami container images are released on a regular basis with the latest distribution packages available.