diff --git a/bitnami/java/1.8/Dockerfile b/bitnami/java/1.8/Dockerfile
index 1a1e539e5164..8ba9dc48f861 100644
--- a/bitnami/java/1.8/Dockerfile
+++ b/bitnami/java/1.8/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.171-0-linux-x64-debian-8.tar.gz
 
 ENV BITNAMI_APP_NAME="java" \
-    BITNAMI_IMAGE_VERSION="1.8.171-r17" \
+    BITNAMI_IMAGE_VERSION="1.8.171-r18" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:$PATH"
 
diff --git a/bitnami/java/1.8/prod/Dockerfile b/bitnami/java/1.8/prod/Dockerfile
index e488c0fd3035..b4b4d916265f 100644
--- a/bitnami/java/1.8/prod/Dockerfile
+++ b/bitnami/java/1.8/prod/Dockerfile
@@ -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.171-r17" \
+    BITNAMI_IMAGE_VERSION="1.8.171-r18" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:$PATH"
 
diff --git a/bitnami/java/README.md b/bitnami/java/README.md
index 98cdd95990d3..4e1fafd617a5 100644
--- a/bitnami/java/README.md
+++ b/bitnami/java/README.md
@@ -25,7 +25,7 @@ $ docker-compose up -d
 
 # Supported tags and respective `Dockerfile` links
 
- - [`1.8`, `1.8.171-r17`, `latest` (1.8/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.171-r17/1.8/Dockerfile), [`1.8-prod`, `1.8.171-r17-prod` (1.8/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.171-r17/1.8/prod/Dockerfile)
+ - [`1.8`, `1.8.171-r18`, `latest` (1.8/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.171-r18/1.8/Dockerfile), [`1.8-prod`, `1.8.171-r18-prod` (1.8/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.171-r18/1.8/prod/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/java GitHub repo](https://github.com/bitnami/bitnami-docker-java).