diff --git a/bitnami/tomcat/8.5/debian-11/Dockerfile b/bitnami/tomcat/8.5/debian-11/Dockerfile
index f05b88900455..67522d93e005 100644
--- a/bitnami/tomcat/8.5/debian-11/Dockerfile
+++ b/bitnami/tomcat/8.5/debian-11/Dockerfile
@@ -5,11 +5,11 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="8.5.83-debian-11-r14" \
+      org.opencontainers.image.ref.name="8.5.84-debian-11-r0" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/tomcat" \
       org.opencontainers.image.title="tomcat" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="8.5.83"
+      org.opencontainers.image.version="8.5.84"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -23,7 +23,7 @@ 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.17-7-1-linux-${OS_ARCH}-debian-11" \
-      "tomcat-8.5.83-1-linux-${OS_ARCH}-debian-11" \
+      "tomcat-8.5.84-0-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.4-0-linux-${OS_ARCH}-debian-11" \
       "gosu-1.14.0-155-linux-${OS_ARCH}-debian-11" \
     ) && \
@@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/tomcat/postunpack.sh
-ENV APP_VERSION="8.5.83" \
+ENV APP_VERSION="8.5.84" \
     BITNAMI_APP_NAME="tomcat" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/common/bin:$PATH"
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 e8e6474a7742..1ee76333888a 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
@@ -22,9 +22,9 @@
     },
     "tomcat": {
         "arch": "amd64",
-        "digest": "e6b10bbe001dd25322c908b9ba9fe3cdfeedaebdec14baa201734c2b33c88bdf",
+        "digest": "c65c67396244b2810bf7500fcd8ef9b48a10e3b03da9b4f816b2e00e5dc506b0",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.5.83-1"
+        "version": "8.5.84-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/tomcat/8.5/debian-11/tags-info.yaml b/bitnami/tomcat/8.5/debian-11/tags-info.yaml
index 0a1bd947182b..8e583160e547 100644
--- a/bitnami/tomcat/8.5/debian-11/tags-info.yaml
+++ b/bitnami/tomcat/8.5/debian-11/tags-info.yaml
@@ -1,4 +1,4 @@
 rolling-tags:
   - "8.5"
   - "8.5-debian-11"
-  - "8.5.83"
+  - "8.5.84"