diff --git a/bitnami/java/18/debian-11/Dockerfile b/bitnami/java/18/debian-11/Dockerfile
index 7b68a3c86e88..1396941d231d 100644
--- a/bitnami/java/18/debian-11/Dockerfile
+++ b/bitnami/java/18/debian-11/Dockerfile
@@ -5,7 +5,7 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="18.0.1-1-debian-11-r32" \
+      org.opencontainers.image.ref.name="18.0.1-1-debian-11-r33" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/java" \
       org.opencontainers.image.title="java" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -20,21 +20,19 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl libsqlite3-dev libssl-dev locales procps wget zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f java-18.0.1-1-5-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-18.0.1-1-5-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-18.0.1-1-5-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c java-18.0.1-1-5-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf java-18.0.1-1-5-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf java-18.0.1-1-5-linux-${OS_ARCH}-debian-11.tar.gz java-18.0.1-1-5-linux-${OS_ARCH}-debian-11.tar.gz.sha256
-RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256
+    COMPONENTS=( \
+      "java-18.0.1-1-6-linux-${OS_ARCH}-debian-11" \
+      "gosu-1.14.0-155-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' && \
+      rm -rf "${COMPONENT}.tar.gz{,sha256}" ; \
+    done
 RUN apt-get autoremove --purge -y curl && \
     apt-get update && apt-get upgrade -y && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/java/18/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/java/18/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 1d33989e7585..4e56ea9c4459 100644
--- a/bitnami/java/18/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/java/18/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,16 +1,16 @@
 {
     "gosu": {
         "arch": "amd64",
-        "digest": "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab",
+        "digest": "f21869b27c26b9c3053bce8b419a0fdf1dc45fcf13a7c2058e0afb6996d3687f",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.14.0-154"
+        "version": "1.14.0-155"
     },
     "java": {
         "arch": "amd64",
-        "digest": "ac4b12ceb7565f4b1c8a805eac578292ebb9a28ae277046648b3b727674b286f",
+        "digest": "56148cdd9c6870bc5af9b37624e71dfff9db22ca76c6a90a4d02bfbeeb2aec2c",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "18.0.1-1-5"
+        "version": "18.0.1-1-6"
     }
 }
\ No newline at end of file
diff --git a/bitnami/java/README.md b/bitnami/java/README.md
index bf9cbb08b4e4..04e9a4d3d866 100644
--- a/bitnami/java/README.md
+++ b/bitnami/java/README.md
@@ -36,9 +36,9 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`19`, `19-debian-11`, `19.0.0`, `19.0.0-debian-11-r3`, `latest` (19/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/java/19/debian-11/Dockerfile)
-* [`18`, `18-debian-11`, `18.0.1-1`, `18.0.1-1-debian-11-r32` (18/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/java/18/debian-11/Dockerfile)
+* [`18`, `18-debian-11`, `18.0.1-1`, `18.0.1-1-debian-11-r33` (18/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/java/18/debian-11/Dockerfile)
 * [`17`, `17-debian-11`, `17.0.4-8`, `17.0.4-8-debian-11-r21` (17/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/java/17/debian-11/Dockerfile)
-* [`11`, `11-debian-11`, `11.0.16`, `11.0.16-debian-11-r5` (11/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/java/11/debian-11/Dockerfile)
+* [`11`, `11-debian-11`, `11.0.16`, `11.0.16-debian-11-r6` (11/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/java/11/debian-11/Dockerfile)
 * [`1.8`, `1.8-debian-11`, `1.8.345`, `1.8.345-debian-11-r21` (1.8/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/java/1.8/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).