diff --git a/bitnami/java/11-prod/debian-9/Dockerfile b/bitnami/java/11-prod/debian-9/Dockerfile
index 580f6d1b73e6..591b9a8b77b9 100644
--- a/bitnami/java/11-prod/debian-9/Dockerfile
+++ b/bitnami/java/11-prod/debian-9/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/java:11.0.5-debian-9-r60 as development
+FROM bitnami/java:11.0.5-debian-9-r61 as development
 
 ######
 
@@ -14,7 +14,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS    90/' /etc/login.defs && \
 COPY --from=development /opt/bitnami/java /opt/bitnami/java
 
 ENV BITNAMI_APP_NAME="java" \
-    BITNAMI_IMAGE_VERSION="11.0.5-debian-9-r57-prod" \
+    BITNAMI_IMAGE_VERSION="11.0.5-debian-9-r58-prod" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:$PATH"
 
diff --git a/bitnami/java/README.md b/bitnami/java/README.md
index ecfda92e4efa..0475862de41f 100644
--- a/bitnami/java/README.md
+++ b/bitnami/java/README.md
@@ -53,7 +53,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 - [`11`, `11.0.5-ol-7-r74-prod` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.5-ol-7-r74-prod/11/ol-7/Dockerfile), [`11-prod`, `11.0.5-ol-7-r74-prod-prod` (11/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.5-ol-7-r74-prod/11/ol-7/prod/Dockerfile)
 - [`11`, `11.0.5-ol-7-r73` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.5-ol-7-r73/11/ol-7/Dockerfile), [`11-prod`, `11.0.5-ol-7-r73-prod` (11/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.5-ol-7-r73/11/ol-7/prod/Dockerfile)
 - [`11`, `11.0.5-debian-9-r61` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.5-debian-9-r61/11/debian-9/Dockerfile), [`11-prod`, `11.0.5-debian-9-r61-prod` (11/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.5-debian-9-r61/11/debian-9/prod/Dockerfile)
-- [`11`, `11.0.5-debian-9-r57-prod` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.5-debian-9-r57-prod/11/debian-9/Dockerfile), [`11-prod`, `11.0.5-debian-9-r57-prod-prod` (11/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.5-debian-9-r57-prod/11/debian-9/prod/Dockerfile)
+- [`11`, `11.0.5-debian-9-r58-prod` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.5-debian-9-r58-prod/11/debian-9/Dockerfile), [`11-prod`, `11.0.5-debian-9-r58-prod-prod` (11/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.5-debian-9-r58-prod/11/debian-9/prod/Dockerfile)
 - [`10`, `10.0.2-photon-3-r0` (10/photon-3/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/10.0.2-photon-3-r0/10/photon-3/Dockerfile), [`10-prod`, `10.0.2-photon-3-r0-prod` (10/photon-3/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/10.0.2-photon-3-r0/10/photon-3/prod/Dockerfile)
 - [`10`, `10.0.2-ol-7-r0` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/10.0.2-ol-7-r0/10/ol-7/Dockerfile), [`10-prod`, `10.0.2-ol-7-r0-prod` (10/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/10.0.2-ol-7-r0/10/ol-7/prod/Dockerfile)
 - [`10`, `10.0.2-debian-9-r0` (10/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/10.0.2-debian-9-r0/10/debian-9/Dockerfile), [`10-prod`, `10.0.2-debian-9-r0-prod` (10/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/10.0.2-debian-9-r0/10/debian-9/prod/Dockerfile)