diff --git a/bitnami/java/16/debian-10/Dockerfile b/bitnami/java/16/debian-10/Dockerfile
index 60cd2044de69..bd2806628701 100644
--- a/bitnami/java/16/debian-10/Dockerfile
+++ b/bitnami/java/16/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-debian-10-r8" \
+    BITNAMI_IMAGE_VERSION="16.0.0-debian-10-r9" \
     JAVA_HOME="/opt/bitnami/java" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
diff --git a/bitnami/java/16/debian-10/docker-compose.yml b/bitnami/java/16/debian-10/docker-compose.yml
index b1e733397ca7..ad626959948a 100644
--- a/bitnami/java/16/debian-10/docker-compose.yml
+++ b/bitnami/java/16/debian-10/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   java:
     tty: true # Enables debugging capabilities when attached to this container.
-    image: 'docker.io/bitnami/java:16-debian-10'
+    image: docker.io/bitnami/java:16
     command: ["tail", "-f", "/dev/null"] # To keep the container running
     ports:
       - 8080:8080
diff --git a/bitnami/java/16/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh b/bitnami/java/16/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
index 601a83c04d97..de3120bd8ec0 100755
--- a/bitnami/java/16/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
+++ b/bitnami/java/16/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
@@ -33,6 +33,7 @@ if [[ "$WITH_ALL_LOCALES" =~ ^(yes|true|1)$ ]]; then
     echo "Enabling all locales"
     cp "$SUPPORTED_LOCALES_FILE" "$LOCALES_FILE"
 else
+    # shellcheck disable=SC2001
     LOCALES_TO_ADD="$(sed 's/[,;]\s*/\n/g' <<< "$EXTRA_LOCALES")"
     while [[ -n "$LOCALES_TO_ADD" ]] && read -r locale; do
         echo "Enabling locale ${locale}"
diff --git a/bitnami/java/README.md b/bitnami/java/README.md
index 2e76f1d9364a..cb72d8b71969 100644
--- a/bitnami/java/README.md
+++ b/bitnami/java/README.md
@@ -31,7 +31,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 - [`16-prod`, `16.0.0-prod-debian-10-r8` (16-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/16.0.0-prod-debian-10-r8/16-prod/debian-10/Dockerfile), [`16-prod-prod`, `16.0.0-prod-debian-10-r8-prod` (16-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/16.0.0-prod-debian-10-r8/16-prod/debian-10/prod/Dockerfile)
-- [`16`, `16.0.0-debian-10-r8` (16/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/16.0.0-debian-10-r8/16/debian-10/Dockerfile), [`16-prod`, `16.0.0-debian-10-r8-prod` (16/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/16.0.0-debian-10-r8/16/debian-10/prod/Dockerfile)
+- [`16`, `16.0.0-debian-10-r9` (16/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/16.0.0-debian-10-r9/16/debian-10/Dockerfile), [`16-prod`, `16.0.0-debian-10-r9-prod` (16/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/16.0.0-debian-10-r9/16/debian-10/prod/Dockerfile)
 - [`15-prod`, `15.0.2-prod-debian-10-r71` (15-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/15.0.2-prod-debian-10-r71/15-prod/debian-10/Dockerfile), [`15-prod-prod`, `15.0.2-prod-debian-10-r71-prod` (15-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/15.0.2-prod-debian-10-r71/15-prod/debian-10/prod/Dockerfile)
 - [`15`, `15.0.2-debian-10-r71` (15/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/15.0.2-debian-10-r71/15/debian-10/Dockerfile), [`15-prod`, `15.0.2-debian-10-r71-prod` (15/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/15.0.2-debian-10-r71/15/debian-10/prod/Dockerfile)
 - [`11-prod`, `11.0.10-prod-debian-10-r71` (11-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.10-prod-debian-10-r71/11-prod/debian-10/Dockerfile), [`11-prod-prod`, `11.0.10-prod-debian-10-r71-prod` (11-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.10-prod-debian-10-r71/11-prod/debian-10/prod/Dockerfile)