diff --git a/bitnami/java/1.8/debian-9/Dockerfile b/bitnami/java/1.8/debian-9/Dockerfile
index 1534d4acbbd2..b95fe3d6db3a 100644
--- a/bitnami/java/1.8/debian-9/Dockerfile
+++ b/bitnami/java/1.8/debian-9/Dockerfile
@@ -9,7 +9,7 @@ RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stac
     rm -rf /tmp/bitnami/pkg/cache/java-1.8.181-1-linux-amd64-debian-9.tar.gz
 
 ENV BITNAMI_APP_NAME="java" \
-    BITNAMI_IMAGE_VERSION="1.8.181-debian-9-r39" \
+    BITNAMI_IMAGE_VERSION="1.8.181-debian-9-r40" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:$PATH"
 
diff --git a/bitnami/java/1.8/debian-9/prod/Dockerfile b/bitnami/java/1.8/debian-9/prod/Dockerfile
index a56a18fbaa2d..9046de06b182 100644
--- a/bitnami/java/1.8/debian-9/prod/Dockerfile
+++ b/bitnami/java/1.8/debian-9/prod/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM bitnami/java:1.8.181-debian-9-r39 as development
+FROM bitnami/java:1.8.181-debian-9-r40 as development
 
 FROM bitnami/minideb:stretch
 LABEL maintainer "Bitnami <containers@bitnami.com>"
@@ -7,7 +7,7 @@ LABEL maintainer "Bitnami <containers@bitnami.com>"
 COPY --from=development /opt/bitnami/java /opt/bitnami/java
 
 ENV BITNAMI_APP_NAME="java" \
-    BITNAMI_IMAGE_VERSION="1.8.181-debian-9-r39" \
+    BITNAMI_IMAGE_VERSION="1.8.181-debian-9-r40" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:$PATH"
 
diff --git a/bitnami/java/README.md b/bitnami/java/README.md
index 4428bdaa1487..118d6416b009 100644
--- a/bitnami/java/README.md
+++ b/bitnami/java/README.md
@@ -30,8 +30,8 @@ $ docker-compose up -d
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/).
 
 
- - [`1.8`, `1.8.181-ol-7-r32` (1.8/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.181-ol-7-r32/1.8/Dockerfile), [`1.8-prod`, `1.8.181-ol-7-r32-prod` (1.8/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.181-ol-7-r32/1.8/prod/Dockerfile)
- - [`1.8`, `1.8.181-debian-9-r39` (1.8/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.181-debian-9-r39/1.8/Dockerfile), [`1.8-prod`, `1.8.181-debian-9-r39-prod` (1.8/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.181-debian-9-r39/1.8/prod/Dockerfile)
+ - [`1.8`, `1.8.181-ol-7-r31` (1.8/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.181-ol-7-r31/1.8/Dockerfile), [`1.8-prod`, `1.8.181-ol-7-r31-prod` (1.8/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.181-ol-7-r31/1.8/prod/Dockerfile)
+ - [`1.8`, `1.8.181-debian-9-r40` (1.8/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.181-debian-9-r40/1.8/Dockerfile), [`1.8-prod`, `1.8.181-debian-9-r40-prod` (1.8/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.181-debian-9-r40/1.8/prod/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/java GitHub repo](https://github.com/bitnami/bitnami-docker-java).