diff --git a/bitnami/java/16-prod/debian-10/Dockerfile b/bitnami/java/16-prod/debian-10/Dockerfile
index 8bba8d04d490..248cc433be79 100644
--- a/bitnami/java/16-prod/debian-10/Dockerfile
+++ b/bitnami/java/16-prod/debian-10/Dockerfile
@@ -24,7 +24,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS    90/' /etc/login.defs && \
 COPY rootfs /
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV BITNAMI_APP_NAME="java" \
-    BITNAMI_IMAGE_VERSION="16.0.0-prod-debian-10-r17" \
+    BITNAMI_IMAGE_VERSION="16.0.0-prod-debian-10-r18" \
     JAVA_HOME="/opt/bitnami/java" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
diff --git a/bitnami/java/README.md b/bitnami/java/README.md
index 94a8aa7af474..88ace43a305c 100644
--- a/bitnami/java/README.md
+++ b/bitnami/java/README.md
@@ -30,7 +30,7 @@ $ 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/tutorials/understand-rolling-tags-containers/).
 
 
-- [`16-prod`, `16.0.0-prod-debian-10-r17` (16-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/16.0.0-prod-debian-10-r17/16-prod/debian-10/Dockerfile), [`16-prod-prod`, `16.0.0-prod-debian-10-r17-prod` (16-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/16.0.0-prod-debian-10-r17/16-prod/debian-10/prod/Dockerfile)
+- [`16-prod`, `16.0.0-prod-debian-10-r18` (16-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/16.0.0-prod-debian-10-r18/16-prod/debian-10/Dockerfile), [`16-prod-prod`, `16.0.0-prod-debian-10-r18-prod` (16-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/16.0.0-prod-debian-10-r18/16-prod/debian-10/prod/Dockerfile)
 - [`16`, `16.0.0-debian-10-r18` (16/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/16.0.0-debian-10-r18/16/debian-10/Dockerfile), [`16-prod`, `16.0.0-debian-10-r18-prod` (16/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/16.0.0-debian-10-r18/16/debian-10/prod/Dockerfile)
 - [`15-prod`, `15.0.2-prod-debian-10-r81` (15-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/15.0.2-prod-debian-10-r81/15-prod/debian-10/Dockerfile), [`15-prod-prod`, `15.0.2-prod-debian-10-r81-prod` (15-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/15.0.2-prod-debian-10-r81/15-prod/debian-10/prod/Dockerfile)
 - [`15`, `15.0.2-debian-10-r81` (15/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/15.0.2-debian-10-r81/15/debian-10/Dockerfile), [`15-prod`, `15.0.2-debian-10-r81-prod` (15/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/15.0.2-debian-10-r81/15/debian-10/prod/Dockerfile)