diff --git a/bitnami/tomcat/9.0/debian-10/Dockerfile b/bitnami/tomcat/9.0/debian-10/Dockerfile
index 8348c7d4b8b6..3f2bc5654fd9 100644
--- a/bitnami/tomcat/9.0/debian-10/Dockerfile
+++ b/bitnami/tomcat/9.0/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" "9.0.59-0" --checksum f6f3600acc829e773a223f2f76f65b512451cfb9b1a0b6feca580de4fa7bf95e
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "tomcat" "9.0.59-1" --checksum b5969e9f721752c4feadafdefa987b13f35203dfa1c32797784f931653e62ecd
 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 && \
@@ -23,7 +23,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/tomcat/postunpack.sh
 ENV BITNAMI_APP_NAME="tomcat" \
-    BITNAMI_IMAGE_VERSION="9.0.59-debian-10-r1" \
+    BITNAMI_IMAGE_VERSION="9.0.59-debian-10-r2" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/common/bin:$PATH"
 
diff --git a/bitnami/tomcat/9.0/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tomcat/9.0/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index 47153994e05c..6778e0955c39 100644
--- a/bitnami/tomcat/9.0/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/tomcat/9.0/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -22,9 +22,9 @@
     },
     "tomcat": {
         "arch": "amd64",
-        "digest": "f6f3600acc829e773a223f2f76f65b512451cfb9b1a0b6feca580de4fa7bf95e",
+        "digest": "b5969e9f721752c4feadafdefa987b13f35203dfa1c32797784f931653e62ecd",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "9.0.59-0"
+        "version": "9.0.59-1"
     }
 }
\ No newline at end of file
diff --git a/bitnami/tomcat/9.0/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh b/bitnami/tomcat/9.0/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh
index 047d8e33ed7f..2860e6b55119 100644
--- a/bitnami/tomcat/9.0/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh
+++ b/bitnami/tomcat/9.0/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh
@@ -180,7 +180,7 @@ EOF
         # Use tomcat:root ownership for compatibility when running as a non-root user
         am_i_root && configure_permissions_ownership "$TOMCAT_WEBAPPS_DIR" -d "775" -f "664" -u "$TOMCAT_DAEMON_USER" -g "root"
 
-        if is_boolean_yes "$TOMCAT_INSTALL_DEFAULT_WEBAPPS"; then 
+        if is_boolean_yes "$TOMCAT_INSTALL_DEFAULT_WEBAPPS"; then
             info "Deploying Tomcat from scratch"
             cp -rp "$TOMCAT_BASE_DIR"/webapps_default/* "$TOMCAT_WEBAPPS_DIR"
         else
diff --git a/bitnami/tomcat/9.0/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh b/bitnami/tomcat/9.0/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh
index 9a4b56a8395a..904c13fa73f1 100644
--- a/bitnami/tomcat/9.0/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh
+++ b/bitnami/tomcat/9.0/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh
@@ -31,6 +31,7 @@ tomcat_env_vars=(
     TOMCAT_ENABLE_AJP
     TOMCAT_START_RETRIES
     TOMCAT_EXTRA_JAVA_OPTS
+    TOMCAT_INSTALL_DEFAULT_WEBAPPS
     JAVA_OPTS
 )
 for env_var in "${tomcat_env_vars[@]}"; do
diff --git a/bitnami/tomcat/README.md b/bitnami/tomcat/README.md
index bf37c1c743e7..74f90cb939ca 100644
--- a/bitnami/tomcat/README.md
+++ b/bitnami/tomcat/README.md
@@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`10`, `10-debian-10`, `10.0.17`, `10.0.17-debian-10-r1` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/10.0.17-debian-10-r1/10/debian-10/Dockerfile)
-* [`9.0`, `9.0-debian-10`, `9.0.59`, `9.0.59-debian-10-r1`, `latest` (9.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/9.0.59-debian-10-r1/9.0/debian-10/Dockerfile)
+* [`9.0`, `9.0-debian-10`, `9.0.59`, `9.0.59-debian-10-r2`, `latest` (9.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/9.0.59-debian-10-r2/9.0/debian-10/Dockerfile)
 * [`8.5`, `8.5-debian-10`, `8.5.76`, `8.5.76-debian-10-r0` (8.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/8.5.76-debian-10-r0/8.5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/tomcat GitHub repo](https://github.com/bitnami/bitnami-docker-tomcat).
@@ -155,7 +155,7 @@ The Apache Tomcat instance can be customized by specifying environment variables
 - `TOMCAT_ENABLE_AUTH`: Whether to enable authentication for Apache Tomcat manager application. Default: **yes**
 - `TOMCAT_ENABLE_AJP`: Whether to enable the Apache Tomcat AJP connector. Default: **no**
 - `TOMCAT_EXTRA_JAVA_OPTS`: Additional Java settings for Apache Tomcat. No defaults.
-- `TOMCAT_INSTALL_DEFAULT_WEBAPPS`: Adds default webapps (ROOT, manager, host-manager, etc.) for deployment. Default: **yes**
+- `TOMCAT_INSTALL_DEFAULT_WEBAPPS`: Whether to add default webapps (ROOT, manager, host-manager, etc.) for deployment. Default: **yes**
 
 #### Creating a custom user