diff --git a/bitnami/java/11-prod/debian-9/Dockerfile b/bitnami/java/11-prod/debian-9/Dockerfile
index 7dca5fcc1abb..e4e7f7adefaa 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.2-debian-9-r16 as development
+FROM bitnami/java:11.0.2-debian-9-r17 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.2-debian-9-r17-prod" \
+    BITNAMI_IMAGE_VERSION="11.0.2-debian-9-r18-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 9effc06a27c7..323487e8fbab 100644
--- a/bitnami/java/README.md
+++ b/bitnami/java/README.md
@@ -46,9 +46,9 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 - [`11`, `11.0.2-rhel-7-r22` (11/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.2-rhel-7-r22/11/rhel-7/Dockerfile), [`11-prod`, `11.0.2-rhel-7-r22-prod` (11/rhel-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.2-rhel-7-r22/11/rhel-7/prod/Dockerfile)
 - [`11`, `11.0.2-ol-7-r20` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.2-ol-7-r20/11/ol-7/Dockerfile), [`11-prod`, `11.0.2-ol-7-r20-prod` (11/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.2-ol-7-r20/11/ol-7/prod/Dockerfile)
 - [`11`, `11.0.2-ol-7-r19-prod` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.2-ol-7-r19-prod/11/ol-7/Dockerfile), [`11-prod`, `11.0.2-ol-7-r19-prod-prod` (11/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.2-ol-7-r19-prod/11/ol-7/prod/Dockerfile)
-- [`11`, `11.0.2-debian-9-r17-prod` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.2-debian-9-r17-prod/11/debian-9/Dockerfile), [`11-prod`, `11.0.2-debian-9-r17-prod-prod` (11/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.2-debian-9-r17-prod/11/debian-9/prod/Dockerfile)
+- [`11`, `11.0.2-debian-9-r18-prod` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.2-debian-9-r18-prod/11/debian-9/Dockerfile), [`11-prod`, `11.0.2-debian-9-r18-prod-prod` (11/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.2-debian-9-r18-prod/11/debian-9/prod/Dockerfile)
 - [`11`, `11.0.2-debian-9-r17` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.2-debian-9-r17/11/debian-9/Dockerfile), [`11-prod`, `11.0.2-debian-9-r17-prod` (11/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.2-debian-9-r17/11/debian-9/prod/Dockerfile)
-- [`1.8`, `1.8.201-rhel-7-r26` (1.8/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-rhel-7-r26/1.8/rhel-7/Dockerfile), [`1.8-prod`, `1.8.201-rhel-7-r26-prod` (1.8/rhel-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-rhel-7-r26/1.8/rhel-7/prod/Dockerfile)
+- [`1.8`, `1.8.201-rhel-7-r25` (1.8/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-rhel-7-r25/1.8/rhel-7/Dockerfile), [`1.8-prod`, `1.8.201-rhel-7-r25-prod` (1.8/rhel-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-rhel-7-r25/1.8/rhel-7/prod/Dockerfile)
 - [`1.8`, `1.8.201-ol-7-r26` (1.8/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-ol-7-r26/1.8/ol-7/Dockerfile), [`1.8-prod`, `1.8.201-ol-7-r26-prod` (1.8/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-ol-7-r26/1.8/ol-7/prod/Dockerfile)
 - [`1.8`, `1.8.201-ol-7-r23-prod` (1.8/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-ol-7-r23-prod/1.8/ol-7/Dockerfile), [`1.8-prod`, `1.8.201-ol-7-r23-prod-prod` (1.8/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-ol-7-r23-prod/1.8/ol-7/prod/Dockerfile)
 - [`1.8`, `1.8.201-debian-9-r24` (1.8/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-debian-9-r24/1.8/debian-9/Dockerfile), [`1.8-prod`, `1.8.201-debian-9-r24-prod` (1.8/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-debian-9-r24/1.8/debian-9/prod/Dockerfile)