diff --git a/bitnami/tomcat/8.5/debian-10/Dockerfile b/bitnami/tomcat/8.5/debian-10/Dockerfile
index 8732343617e6..3b05598f7d4b 100644
--- a/bitnami/tomcat/8.5/debian-10/Dockerfile
+++ b/bitnami/tomcat/8.5/debian-10/Dockerfile
@@ -24,7 +24,7 @@ RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/tomcat/postunpack.sh
 ENV APP_VERSION="8.5.77" \
     BITNAMI_APP_NAME="tomcat" \
-    BITNAMI_IMAGE_VERSION="8.5.77-debian-10-r8" \
+    BITNAMI_IMAGE_VERSION="8.5.77-debian-10-r9" \
     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/scripts/libwebserver.sh b/bitnami/tomcat/8.5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 503650210583..818c2158032b 100644
--- a/bitnami/tomcat/8.5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/tomcat/8.5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -392,10 +392,6 @@ web_server_update_app_configuration() {
             --hosts \
             | --server-name \
             | --server-aliases \
-            | --enable-http \
-            | --enable-https \
-            | --disable-http \
-            | --disable-https \
             | --http-port \
             | --https-port \
             )
diff --git a/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh b/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh
index 904c13fa73f1..8d14cb5528ab 100644
--- a/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh
+++ b/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh
@@ -9,6 +9,7 @@
 # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata)
 
 # Load logging library
+# shellcheck disable=SC1090,SC1091
 . /opt/bitnami/scripts/liblog.sh
 
 export BITNAMI_ROOT_DIR="/opt/bitnami"
diff --git a/bitnami/tomcat/README.md b/bitnami/tomcat/README.md
index a405bd117315..76be08c5faf7 100644
--- a/bitnami/tomcat/README.md
+++ b/bitnami/tomcat/README.md
@@ -46,7 +46,7 @@ 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-r10`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/10.0.18-debian-10-r10/10/debian-10/Dockerfile)
 * [`9.0`, `9.0-debian-10`, `9.0.60`, `9.0.60-debian-10-r11` (9.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/9.0.60-debian-10-r11/9.0/debian-10/Dockerfile)
-* [`8.5`, `8.5-debian-10`, `8.5.77`, `8.5.77-debian-10-r8` (8.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/8.5.77-debian-10-r8/8.5/debian-10/Dockerfile)
+* [`8.5`, `8.5-debian-10`, `8.5.77`, `8.5.77-debian-10-r9` (8.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/8.5.77-debian-10-r9/8.5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/tomcat GitHub repo](https://github.com/bitnami/bitnami-docker-tomcat).