diff --git a/bitnami/java/11/debian-10/Dockerfile b/bitnami/java/11/debian-10/Dockerfile
index 351e1b32caa4..7e6ebc04e0cf 100644
--- a/bitnami/java/11/debian-10/Dockerfile
+++ b/bitnami/java/11/debian-10/Dockerfile
@@ -19,7 +19,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS    90/' /etc/login.defs && \
     sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password
 
 ENV BITNAMI_APP_NAME="java" \
-    BITNAMI_IMAGE_VERSION="11.0.6-debian-10-r57" \
+    BITNAMI_IMAGE_VERSION="11.0.6-debian-10-r58" \
     JAVA_HOME="/opt/bitnami/java" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
diff --git a/bitnami/java/README.md b/bitnami/java/README.md
index 9ce24a595803..256a8c0f3da0 100644
--- a/bitnami/java/README.md
+++ b/bitnami/java/README.md
@@ -46,8 +46,8 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 - [`13`, `13.0.2-debian-10-r57-prod` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.2-debian-10-r57-prod/13/debian-10/Dockerfile), [`13-prod`, `13.0.2-debian-10-r57-prod-prod` (13/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.2-debian-10-r57-prod/13/debian-10/prod/Dockerfile)
 - [`13`, `13.0.2-debian-10-r57` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.2-debian-10-r57/13/debian-10/Dockerfile), [`13-prod`, `13.0.2-debian-10-r57-prod` (13/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.2-debian-10-r57/13/debian-10/prod/Dockerfile)
+- [`11`, `11.0.6-debian-10-r58` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.6-debian-10-r58/11/debian-10/Dockerfile), [`11-prod`, `11.0.6-debian-10-r58-prod` (11/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.6-debian-10-r58/11/debian-10/prod/Dockerfile)
 - [`11`, `11.0.6-debian-10-r57-prod` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.6-debian-10-r57-prod/11/debian-10/Dockerfile), [`11-prod`, `11.0.6-debian-10-r57-prod-prod` (11/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.6-debian-10-r57-prod/11/debian-10/prod/Dockerfile)
-- [`11`, `11.0.6-debian-10-r57` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.6-debian-10-r57/11/debian-10/Dockerfile), [`11-prod`, `11.0.6-debian-10-r57-prod` (11/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.6-debian-10-r57/11/debian-10/prod/Dockerfile)
 - [`10`, `10.0.2-debian-10-r0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/10.0.2-debian-10-r0/10/debian-10/Dockerfile), [`10-prod`, `10.0.2-debian-10-r0-prod` (10/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/10.0.2-debian-10-r0/10/debian-10/prod/Dockerfile)
 - [`1.9`, `1.9.181-debian-10-r0` (1.9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.9.181-debian-10-r0/1.9/debian-10/Dockerfile), [`1.9-prod`, `1.9.181-debian-10-r0-prod` (1.9/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.9.181-debian-10-r0/1.9/debian-10/prod/Dockerfile)
 - [`1.8`, `1.8.242-debian-10-r58` (1.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.242-debian-10-r58/1.8/debian-10/Dockerfile), [`1.8-prod`, `1.8.242-debian-10-r58-prod` (1.8/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.242-debian-10-r58/1.8/debian-10/prod/Dockerfile)