diff --git a/bitnami/java/1.8/debian-9/Dockerfile b/bitnami/java/1.8/debian-9/Dockerfile
index 26c751dc7baf..93773669ab35 100644
--- a/bitnami/java/1.8/debian-9/Dockerfile
+++ b/bitnami/java/1.8/debian-9/Dockerfile
@@ -7,9 +7,12 @@ RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stac
     echo "de49557872836fdbd965389ebcc72e163f7242cf691d435993cc2e4f3cd56ae7  /tmp/bitnami/pkg/cache/java-1.8.201-0-linux-amd64-debian-9.tar.gz" | sha256sum -c - && \
     tar -zxf /tmp/bitnami/pkg/cache/java-1.8.201-0-linux-amd64-debian-9.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
     rm -rf /tmp/bitnami/pkg/cache/java-1.8.201-0-linux-amd64-debian-9.tar.gz
+RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS    90/' /etc/login.defs && \
+    sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS    0/' /etc/login.defs && \
+    sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password
 
 ENV BITNAMI_APP_NAME="java" \
-    BITNAMI_IMAGE_VERSION="1.8.201-debian-9-r1" \
+    BITNAMI_IMAGE_VERSION="1.8.201-debian-9-r2" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:$PATH"
 
diff --git a/bitnami/java/README.md b/bitnami/java/README.md
index 16720dae37b4..51546aaca5b0 100644
--- a/bitnami/java/README.md
+++ b/bitnami/java/README.md
@@ -45,9 +45,13 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 - [`1.8`, `1.8.201-rhel-7-r1` (1.8/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-rhel-7-r1/1.8/rhel-7/Dockerfile), [`1.8-prod`, `1.8.201-rhel-7-r1-prod` (1.8/rhel-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-rhel-7-r1/1.8/rhel-7/prod/Dockerfile)
 - [`1.8`, `1.8.201-ol-7-r2` (1.8/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-ol-7-r2/1.8/ol-7/Dockerfile), [`1.8-prod`, `1.8.201-ol-7-r2-prod` (1.8/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-ol-7-r2/1.8/ol-7/prod/Dockerfile)
-- [`1.8`, `1.8.201-debian-9-r1` (1.8/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-debian-9-r1/1.8/debian-9/Dockerfile), [`1.8-prod`, `1.8.201-debian-9-r1-prod` (1.8/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-debian-9-r1/1.8/debian-9/prod/Dockerfile)
+- [`1.8`, `1.8.201-ol-7-r0-prod` (1.8/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-ol-7-r0-prod/1.8/ol-7/Dockerfile), [`1.8-prod`, `1.8.201-ol-7-r0-prod-prod` (1.8/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-ol-7-r0-prod/1.8/ol-7/prod/Dockerfile)
+- [`1.8`, `1.8.201-debian-9-r2` (1.8/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-debian-9-r2/1.8/debian-9/Dockerfile), [`1.8-prod`, `1.8.201-debian-9-r2-prod` (1.8/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-debian-9-r2/1.8/debian-9/prod/Dockerfile)
+- [`1.8`, `1.8.201-debian-9-r0-prod` (1.8/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-debian-9-r0-prod/1.8/debian-9/Dockerfile), [`1.8-prod`, `1.8.201-debian-9-r0-prod-prod` (1.8/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.201-debian-9-r0-prod/1.8/debian-9/prod/Dockerfile)
 - [`1.11`, `0.0.0-rhel-7-r0` (1.11/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/0.0.0-rhel-7-r0/1.11/rhel-7/Dockerfile), [`1.11-prod`, `0.0.0-rhel-7-r0-prod` (1.11/rhel-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/0.0.0-rhel-7-r0/1.11/rhel-7/prod/Dockerfile)
+- [`1.11`, `0.0.0-ol-7-r0-prod` (1.11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/0.0.0-ol-7-r0-prod/1.11/ol-7/Dockerfile), [`1.11-prod`, `0.0.0-ol-7-r0-prod-prod` (1.11/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/0.0.0-ol-7-r0-prod/1.11/ol-7/prod/Dockerfile)
 - [`1.11`, `0.0.0-ol-7-r0` (1.11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/0.0.0-ol-7-r0/1.11/ol-7/Dockerfile), [`1.11-prod`, `0.0.0-ol-7-r0-prod` (1.11/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/0.0.0-ol-7-r0/1.11/ol-7/prod/Dockerfile)
+- [`1.11`, `0.0.0-debian-9-r0-prod` (1.11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/0.0.0-debian-9-r0-prod/1.11/debian-9/Dockerfile), [`1.11-prod`, `0.0.0-debian-9-r0-prod-prod` (1.11/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/0.0.0-debian-9-r0-prod/1.11/debian-9/prod/Dockerfile)
 - [`1.11`, `0.0.0-debian-9-r0` (1.11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/0.0.0-debian-9-r0/1.11/debian-9/Dockerfile), [`1.11-prod`, `0.0.0-debian-9-r0-prod` (1.11/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/0.0.0-debian-9-r0/1.11/debian-9/prod/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/java GitHub repo](https://github.com/bitnami/bitnami-docker-java).