diff --git a/bitnami/tomcat/8.5/debian-11/Dockerfile b/bitnami/tomcat/8.5/debian-11/Dockerfile
index 05149e2c4107..c972647a39fa 100644
--- a/bitnami/tomcat/8.5/debian-11/Dockerfile
+++ b/bitnami/tomcat/8.5/debian-11/Dockerfile
@@ -3,11 +3,11 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 ARG TARGETARCH
 
-LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
-      org.opencontainers.image.description="Application packaged by Bitnami" \
+LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
+      org.opencontainers.image.created="2023-02-17T19:48:42Z" \
+      org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.5.85-debian-11-r11" \
-      org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/tomcat" \
+      org.opencontainers.image.ref.name="8.5.85-debian-11-r12" \
       org.opencontainers.image.title="tomcat" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.5.85"
@@ -23,10 +23,10 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libssl1.1 procps xmlstarlet zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "java-11.0.18-10-0-linux-${OS_ARCH}-debian-11" \
-      "tomcat-8.5.85-5-linux-${OS_ARCH}-debian-11" \
-      "render-template-1.0.5-0-linux-${OS_ARCH}-debian-11" \
-      "gosu-1.16.0-1-linux-${OS_ARCH}-debian-11" \
+      "java-11.0.18-10-1-linux-${OS_ARCH}-debian-11" \
+      "tomcat-8.5.85-6-linux-${OS_ARCH}-debian-11" \
+      "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \
+      "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/tomcat/8.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tomcat/8.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index d252695df870..809bff48acc2 100644
--- a/bitnami/tomcat/8.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/tomcat/8.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,30 +1,30 @@
 {
     "gosu": {
         "arch": "amd64",
-        "digest": "9ab9654690d90d3c49ff66fb1eb286487e318adc899d036bc45922f6b176865b",
+        "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.16.0-1"
+        "version": "1.16.0-2"
     },
     "java": {
         "arch": "amd64",
-        "digest": "f8c3013925073f94edc495584b76f0b08c867ba35c524e2b262e47e815a443b9",
+        "digest": "cd40a6df619d734d300324ad671f34323152e84682bc998da1330f1a7f0acfa6",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "11.0.18-10-0"
+        "version": "11.0.18-10-1"
     },
     "render-template": {
         "arch": "amd64",
-        "digest": "57c1d857acbb187fcb98f4ba26d138af9d866f59ad38dd443a75c0a6422de994",
+        "digest": "185e277977366ec222d2bde1a395ffa138ce1a9d3bdf1df20c3e49e8b8f9c68b",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.0.5-0"
+        "version": "1.0.5-1"
     },
     "tomcat": {
         "arch": "amd64",
-        "digest": "8fc2483baea174594b2a1bade32ed7be425fde8d4f35c8d3e9686d7c9e394399",
+        "digest": "0b5d90663ecc7affc235a4d3e4f1213faf97078f171f078e10899b47ab11acfb",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.5.85-5"
+        "version": "8.5.85-6"
     }
 }
\ No newline at end of file