diff --git a/bitnami/java/11-prod/debian-10/Dockerfile b/bitnami/java/11-prod/debian-10/Dockerfile
index 07a136731b54..fa28cbb41756 100644
--- a/bitnami/java/11-prod/debian-10/Dockerfile
+++ b/bitnami/java/11-prod/debian-10/Dockerfile
@@ -25,7 +25,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 RUN /opt/bitnami/scripts/java/postunpack.sh
 ENV BITNAMI_APP_NAME="java" \
-    BITNAMI_IMAGE_VERSION="11.0.13-prod-debian-10-r15" \
+    BITNAMI_IMAGE_VERSION="11.0.13-prod-debian-10-r16" \
     JAVA_HOME="/opt/bitnami/java" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
diff --git a/bitnami/java/11-prod/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/java/11-prod/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 785d883f325e..459f99c7d1cd 100644
--- a/bitnami/java/11-prod/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/java/11-prod/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -178,13 +178,13 @@ web_server_reload() {
 # Apache-specific flags:
 #   --apache-additional-configuration - Additional vhost configuration (no default)
 #   --apache-before-vhost-configuration - Configuration to add before the <VirtualHost> directive (no default)
-#   --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no')
+#   --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined)
 #   --apache-extra-directory-configuration - Extra configuration for the document root directory
 #   --apache-proxy-address - Address where to proxy requests
 #   --apache-proxy-configuration - Extra configuration for the proxy
 #   --apache-proxy-http-configuration - Extra configuration for the proxy HTTP vhost
 #   --apache-proxy-https-configuration - Extra configuration for the proxy HTTPS vhost
-#   --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup
+#   --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup (only allowed when type is not defined)
 # NGINX-specific flags:
 #   --nginx-additional-configuration - Additional server block configuration (no default)
 #   --nginx-external-configuration - Configuration external to server block (no default)
diff --git a/bitnami/java/README.md b/bitnami/java/README.md
index 29d92cf0db85..a273a1e07bb2 100644
--- a/bitnami/java/README.md
+++ b/bitnami/java/README.md
@@ -38,7 +38,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 - [`17-prod`, `17.0.1-prod-debian-10-r15` (17-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/17.0.1-prod-debian-10-r15/17-prod/debian-10/Dockerfile), [`17-prod-prod`, `17.0.1-prod-debian-10-r15-prod` (17-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/17.0.1-prod-debian-10-r15/17-prod/debian-10/prod/Dockerfile)
 - [`17`, `17.0.1-debian-10-r15` (17/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/17.0.1-debian-10-r15/17/debian-10/Dockerfile), [`17-prod`, `17.0.1-debian-10-r15-prod` (17/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/17.0.1-debian-10-r15/17/debian-10/prod/Dockerfile)
-- [`11-prod`, `11.0.13-prod-debian-10-r15` (11-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.13-prod-debian-10-r15/11-prod/debian-10/Dockerfile), [`11-prod-prod`, `11.0.13-prod-debian-10-r15-prod` (11-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.13-prod-debian-10-r15/11-prod/debian-10/prod/Dockerfile)
+- [`11-prod`, `11.0.13-prod-debian-10-r16` (11-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.13-prod-debian-10-r16/11-prod/debian-10/Dockerfile), [`11-prod-prod`, `11.0.13-prod-debian-10-r16-prod` (11-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.13-prod-debian-10-r16/11-prod/debian-10/prod/Dockerfile)
 - [`11`, `11.0.13-debian-10-r16` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.13-debian-10-r16/11/debian-10/Dockerfile), [`11-prod`, `11.0.13-debian-10-r16-prod` (11/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.13-debian-10-r16/11/debian-10/prod/Dockerfile)
 - [`1.8-prod`, `1.8.312-prod-debian-10-r20` (1.8-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.312-prod-debian-10-r20/1.8-prod/debian-10/Dockerfile), [`1.8-prod-prod`, `1.8.312-prod-debian-10-r20-prod` (1.8-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.312-prod-debian-10-r20/1.8-prod/debian-10/prod/Dockerfile)
 - [`1.8`, `1.8.312-debian-10-r20` (1.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.312-debian-10-r20/1.8/debian-10/Dockerfile), [`1.8-prod`, `1.8.312-debian-10-r20-prod` (1.8/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.312-debian-10-r20/1.8/debian-10/prod/Dockerfile)