diff --git a/bitnami/java/11-prod/debian-9/Dockerfile b/bitnami/java/11-prod/debian-9/Dockerfile
index a46ca5dfd5bd..6affb4361598 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.4-debian-9-r5 as development
+FROM bitnami/java:11.0.4-debian-9-r6 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.4-debian-9-r6-prod" \
+    BITNAMI_IMAGE_VERSION="11.0.4-debian-9-r7-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 82b53b3ba270..9ba759038fb0 100644
--- a/bitnami/java/README.md
+++ b/bitnami/java/README.md
@@ -46,12 +46,12 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 - [`11`, `11.0.4-ol-7-r6-prod` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.4-ol-7-r6-prod/11/ol-7/Dockerfile), [`11-prod`, `11.0.4-ol-7-r6-prod-prod` (11/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.4-ol-7-r6-prod/11/ol-7/prod/Dockerfile)
 - [`11`, `11.0.4-ol-7-r6` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.4-ol-7-r6/11/ol-7/Dockerfile), [`11-prod`, `11.0.4-ol-7-r6-prod` (11/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.4-ol-7-r6/11/ol-7/prod/Dockerfile)
-- [`11`, `11.0.4-debian-9-r6-prod` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.4-debian-9-r6-prod/11/debian-9/Dockerfile), [`11-prod`, `11.0.4-debian-9-r6-prod-prod` (11/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.4-debian-9-r6-prod/11/debian-9/prod/Dockerfile)
+- [`11`, `11.0.4-debian-9-r7-prod` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.4-debian-9-r7-prod/11/debian-9/Dockerfile), [`11-prod`, `11.0.4-debian-9-r7-prod-prod` (11/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.4-debian-9-r7-prod/11/debian-9/prod/Dockerfile)
 - [`11`, `11.0.4-debian-9-r6` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.4-debian-9-r6/11/debian-9/Dockerfile), [`11-prod`, `11.0.4-debian-9-r6-prod` (11/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.4-debian-9-r6/11/debian-9/prod/Dockerfile)
+- [`1.8`, `1.8.222-ol-7-r7` (1.8/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.222-ol-7-r7/1.8/ol-7/Dockerfile), [`1.8-prod`, `1.8.222-ol-7-r7-prod` (1.8/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.222-ol-7-r7/1.8/ol-7/prod/Dockerfile)
 - [`1.8`, `1.8.222-ol-7-r6-prod` (1.8/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.222-ol-7-r6-prod/1.8/ol-7/Dockerfile), [`1.8-prod`, `1.8.222-ol-7-r6-prod-prod` (1.8/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.222-ol-7-r6-prod/1.8/ol-7/prod/Dockerfile)
-- [`1.8`, `1.8.222-ol-7-r6` (1.8/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.222-ol-7-r6/1.8/ol-7/Dockerfile), [`1.8-prod`, `1.8.222-ol-7-r6-prod` (1.8/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.222-ol-7-r6/1.8/ol-7/prod/Dockerfile)
-- [`1.8`, `1.8.222-debian-9-r7-prod` (1.8/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.222-debian-9-r7-prod/1.8/debian-9/Dockerfile), [`1.8-prod`, `1.8.222-debian-9-r7-prod-prod` (1.8/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.222-debian-9-r7-prod/1.8/debian-9/prod/Dockerfile)
-- [`1.8`, `1.8.222-debian-9-r6` (1.8/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.222-debian-9-r6/1.8/debian-9/Dockerfile), [`1.8-prod`, `1.8.222-debian-9-r6-prod` (1.8/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.222-debian-9-r6/1.8/debian-9/prod/Dockerfile)
+- [`1.8`, `1.8.222-debian-9-r7` (1.8/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.222-debian-9-r7/1.8/debian-9/Dockerfile), [`1.8-prod`, `1.8.222-debian-9-r7-prod` (1.8/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.222-debian-9-r7/1.8/debian-9/prod/Dockerfile)
+- [`1.8`, `1.8.222-debian-9-r6-prod` (1.8/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.222-debian-9-r6-prod/1.8/debian-9/Dockerfile), [`1.8-prod`, `1.8.222-debian-9-r6-prod-prod` (1.8/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.222-debian-9-r6-prod/1.8/debian-9/prod/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/java GitHub repo](https://github.com/bitnami/bitnami-docker-java).