diff --git a/bitnami/tomcat/8.5/debian-11/Dockerfile b/bitnami/tomcat/8.5/debian-11/Dockerfile
index eef20372552e..96dea6597da3 100644
--- a/bitnami/tomcat/8.5/debian-11/Dockerfile
+++ b/bitnami/tomcat/8.5/debian-11/Dockerfile
@@ -7,7 +7,7 @@ ENV HOME="/" \
 ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="8.5.82-debian-11-r1" \
+      org.opencontainers.image.ref.name="8.5.82-debian-11-r2" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/tomcat" \
       org.opencontainers.image.title="tomcat" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -18,7 +18,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip libc6 libssl1.1 procps tar xmlstarlet zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.15-1-2" --checksum 1a5468c7b552dfc8a33c5c9b214dbf7dd143a5f008cc3aa2e0418fab5eb16c5c
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "tomcat" "8.5.82-0" --checksum 4578182dcd260573733971e1f7d1f45a13a6405d2ba521845df336020e1ab41d
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "tomcat" "8.5.82-1" --checksum c50e1b98d0fc69129bae23de72c99c72cecfe7e8971223b5d38794bfce679571
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.3-152" --checksum 7909504f3232654c427681ecc8ed4b8599a2df0f17f26ff769a83ed167d05b69
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-153" --checksum d3ae0109be24e8bc56f97359b8290b91243454de946dd60bd8520a0896a88449
 RUN apt-get update && apt-get upgrade -y && \
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 2136dcd8cc99..7a9c70c315eb 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": "4578182dcd260573733971e1f7d1f45a13a6405d2ba521845df336020e1ab41d",
+        "digest": "c50e1b98d0fc69129bae23de72c99c72cecfe7e8971223b5d38794bfce679571",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.5.82-0"
+        "version": "8.5.82-1"
     }
 }
\ 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
new file mode 100644
index 000000000000..a125f2b02516
--- /dev/null
+++ b/bitnami/tomcat/8.5/debian-11/tags-info.yaml
@@ -0,0 +1,4 @@
+rolling-tags:
+  - "8.5"
+  - "8.5-debian-11"
+  - "8.5.82"
diff --git a/bitnami/tomcat/README.md b/bitnami/tomcat/README.md
index 73e3fd2ca290..b7bd70a65e55 100644
--- a/bitnami/tomcat/README.md
+++ b/bitnami/tomcat/README.md
@@ -43,7 +43,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`10`, `10-debian-11`, `10.0.23`, `10.0.23-debian-11-r7`, `latest` (10/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/tomcat/10/debian-11/Dockerfile)
 * [`9.0`, `9.0-debian-11`, `9.0.65`, `9.0.65-debian-11-r10` (9.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/tomcat/9.0/debian-11/Dockerfile)
-* [`8.5`, `8.5-debian-11`, `8.5.82`, `8.5.82-debian-11-r1` (8.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/tomcat/8.5/debian-11/Dockerfile)
+* [`8.5`, `8.5-debian-11`, `8.5.82`, `8.5.82-debian-11-r2` (8.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/tomcat/8.5/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).