diff --git a/bitnami/tomcat/8.5/debian-10/Dockerfile b/bitnami/tomcat/8.5/debian-10/Dockerfile
index 0d384032d912..704c529372bf 100644
--- a/bitnami/tomcat/8.5/debian-10/Dockerfile
+++ b/bitnami/tomcat/8.5/debian-10/Dockerfile
@@ -12,7 +12,7 @@ COPY prebuildfs /
 # 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.14-7" --checksum 900545c4f346a0ece8abf2caf64fd9d4ab7514967d4614d716bf7362b24f828b
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "tomcat" "8.5.77-0" --checksum 5c836c258d59675bab8bef6466511c71713ed7b35937b284514f6f56fe7fa5dc
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "tomcat" "8.5.77-1" --checksum 2b4461560144cdf82b589518c55ac1d357b8dd71ea32f0b91ace1475a6682002
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-10" --checksum 97c2ae4b001c5937e888b920bee7b1a40a076680caac53ded6d10f6207d54565
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-7" --checksum d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1
 RUN apt-get update && apt-get upgrade -y && \
@@ -22,8 +22,9 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/tomcat/postunpack.sh
-ENV BITNAMI_APP_NAME="tomcat" \
-    BITNAMI_IMAGE_VERSION="8.5.77-debian-10-r5" \
+ENV APP_VERSION="8.5.77" \
+    BITNAMI_APP_NAME="tomcat" \
+    BITNAMI_IMAGE_VERSION="8.5.77-debian-10-r6" \
     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-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tomcat/8.5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index d6ce9143f50c..64b0228f795b 100644
--- a/bitnami/tomcat/8.5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/tomcat/8.5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -22,9 +22,9 @@
     },
     "tomcat": {
         "arch": "amd64",
-        "digest": "5c836c258d59675bab8bef6466511c71713ed7b35937b284514f6f56fe7fa5dc",
+        "digest": "2b4461560144cdf82b589518c55ac1d357b8dd71ea32f0b91ace1475a6682002",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "8.5.77-0"
+        "version": "8.5.77-1"
     }
 }
\ No newline at end of file
diff --git a/bitnami/tomcat/README.md b/bitnami/tomcat/README.md
index 39c4f3fe0e77..331167dc075b 100644
--- a/bitnami/tomcat/README.md
+++ b/bitnami/tomcat/README.md
@@ -45,8 +45,8 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`10`, `10-debian-10`, `10.0.18`, `10.0.18-debian-10-r7`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/10.0.18-debian-10-r7/10/debian-10/Dockerfile)
-* [`9.0`, `9.0-debian-10`, `9.0.60`, `9.0.60-debian-10-r7` (9.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/9.0.60-debian-10-r7/9.0/debian-10/Dockerfile)
-* [`8.5`, `8.5-debian-10`, `8.5.77`, `8.5.77-debian-10-r5` (8.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/8.5.77-debian-10-r5/8.5/debian-10/Dockerfile)
+* [`9.0`, `9.0-debian-10`, `9.0.60`, `9.0.60-debian-10-r8` (9.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/9.0.60-debian-10-r8/9.0/debian-10/Dockerfile)
+* [`8.5`, `8.5-debian-10`, `8.5.77`, `8.5.77-debian-10-r6` (8.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/8.5.77-debian-10-r6/8.5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/tomcat GitHub repo](https://github.com/bitnami/bitnami-docker-tomcat).
 
@@ -314,7 +314,7 @@ If you encountered a problem running this container, you can file an [issue](htt
 - Host OS and version
 - Docker version (`docker version`)
 - Output of `docker info`
-- Version of this container (`echo $BITNAMI_IMAGE_VERSION` inside the container)
+- Version of this container
 - The command you used to run the container, and any relevant output you saw (masking any sensitive information)
 
 ## License