diff --git a/bitnami/tomcat/8.5/debian-11/Dockerfile b/bitnami/tomcat/8.5/debian-11/Dockerfile
index 7d444c0c8c22..23a9b5a28396 100644
--- a/bitnami/tomcat/8.5/debian-11/Dockerfile
+++ b/bitnami/tomcat/8.5/debian-11/Dockerfile
@@ -4,13 +4,13 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-03-11T03:12:24Z" \
+      org.opencontainers.image.created="2023-03-13T11:22:28Z" \
       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-r19" \
+      org.opencontainers.image.ref.name="8.5.87-debian-11-r0" \
       org.opencontainers.image.title="tomcat" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="8.5.85"
+      org.opencontainers.image.version="8.5.87"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -24,7 +24,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.18-10-2-linux-${OS_ARCH}-debian-11" \
-      "tomcat-8.5.85-7-linux-${OS_ARCH}-debian-11" \
+      "tomcat-8.5.87-0-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" \
     ) && \
@@ -45,7 +45,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.85" \
+ENV APP_VERSION="8.5.87" \
     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 e8f12ff6332e..848ac8431b45 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": "001821b8124837dd7804dbc2da7112248b6cf2140f2a2578515642249d7b3d22",
+        "digest": "15b6e7d0a2bb4259bf8cbc58561f3eaedbf86e8ceaaf304942d7ed817990598c",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.5.85-7"
+        "version": "8.5.87-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/tomcat/8.5/debian-11/rootfs/opt/bitnami/scripts/libtomcat.sh b/bitnami/tomcat/8.5/debian-11/rootfs/opt/bitnami/scripts/libtomcat.sh
index abbcd2762f59..e4be4ab8e184 100644
--- a/bitnami/tomcat/8.5/debian-11/rootfs/opt/bitnami/scripts/libtomcat.sh
+++ b/bitnami/tomcat/8.5/debian-11/rootfs/opt/bitnami/scripts/libtomcat.sh
@@ -192,7 +192,7 @@ EOF
         # Valve docs for Access Control: https://tomcat.apache.org/tomcat-9.0-doc/config/valve.html#Access_Control
         if is_boolean_yes "$TOMCAT_ALLOW_REMOTE_MANAGEMENT"; then
             info "Enabling remote connections for manager and host-manager applications"
-            for application in manager host-manager; do
+             for application in manager host-manager examples docs; do
                 [[ -f "${TOMCAT_WEBAPPS_DIR}/${application}/META-INF/context.xml" ]] || continue
                 xmlstarlet ed -S --inplace --update '//Valve/@allow' --value '\d+\.\d+\.\d+\.\d+' "${TOMCAT_WEBAPPS_DIR}/${application}/META-INF/context.xml"
             done
diff --git a/bitnami/tomcat/8.5/debian-11/tags-info.yaml b/bitnami/tomcat/8.5/debian-11/tags-info.yaml
index 530699b83b0a..d8b99e3f32cd 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.85
+- 8.5.87