diff --git a/bitnami/java/11/debian-10/Dockerfile b/bitnami/java/11/debian-10/Dockerfile
index d9444bcf869f..9d342f2341cf 100644
--- a/bitnami/java/11/debian-10/Dockerfile
+++ b/bitnami/java/11/debian-10/Dockerfile
@@ -1,6 +1,10 @@
 FROM docker.io/bitnami/minideb:buster
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
+ENV OS_ARCH="amd64" \
+    OS_FLAVOUR="debian-10" \
+    OS_NAME="linux"
+
 COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl gzip libc6 libsqlite3-dev libssl-dev locales procps tar wget zlib1g
@@ -19,14 +23,13 @@ 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
 
+COPY rootfs /
+RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV BITNAMI_APP_NAME="java" \
-    BITNAMI_IMAGE_VERSION="11.0.8-debian-10-r6" \
+    BITNAMI_IMAGE_VERSION="11.0.8-debian-10-r7" \
     JAVA_HOME="/opt/bitnami/java" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
-    OS_ARCH="amd64" \
-    OS_FLAVOUR="debian-10" \
-    OS_NAME="linux" \
     PATH="/opt/bitnami/java/bin:$PATH"
 
 CMD [ "bash" ]
diff --git a/bitnami/java/11/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh b/bitnami/java/11/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
new file mode 100755
index 000000000000..601a83c04d97
--- /dev/null
+++ b/bitnami/java/11/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# shellcheck disable=SC1091
+
+set -o errexit
+set -o nounset
+set -o pipefail
+# set -o xtrace # Uncomment this line for debugging purpose
+
+# Defaults
+WITH_ALL_LOCALES="${WITH_ALL_LOCALES:-no}"
+EXTRA_LOCALES="${EXTRA_LOCALES:-}"
+
+# Constants
+LOCALES_FILE="/etc/locale.gen"
+SUPPORTED_LOCALES_FILE="/usr/share/i18n/SUPPORTED"
+
+# Helper function for enabling locale only when it was not added before
+enable_locale() {
+    local -r locale="${1:?missing locale}"
+    if ! grep -q -E "^${locale}$" "$SUPPORTED_LOCALES_FILE"; then
+        echo "Locale ${locale} is not supported in this system"
+        return 1
+    fi
+    if ! grep -q -E "^${locale}" "$LOCALES_FILE"; then
+        echo "$locale" >> "$LOCALES_FILE"
+    else
+        echo "Locale ${locale} is already enabled"
+    fi
+}
+
+if [[ "$WITH_ALL_LOCALES" =~ ^(yes|true|1)$ ]]; then
+    echo "Enabling all locales"
+    cp "$SUPPORTED_LOCALES_FILE" "$LOCALES_FILE"
+else
+    LOCALES_TO_ADD="$(sed 's/[,;]\s*/\n/g' <<< "$EXTRA_LOCALES")"
+    while [[ -n "$LOCALES_TO_ADD" ]] && read -r locale; do
+        echo "Enabling locale ${locale}"
+        enable_locale "$locale"
+    done <<< "$LOCALES_TO_ADD"
+fi
+
+locale-gen
diff --git a/bitnami/java/README.md b/bitnami/java/README.md
index 9b332273f80f..69feb28ba5de 100644
--- a/bitnami/java/README.md
+++ b/bitnami/java/README.md
@@ -33,7 +33,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 - [`14-prod`, `14.0.2-prod-debian-10-r7` (14-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/14.0.2-prod-debian-10-r7/14-prod/debian-10/Dockerfile), [`14-prod-prod`, `14.0.2-prod-debian-10-r7-prod` (14-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/14.0.2-prod-debian-10-r7/14-prod/debian-10/prod/Dockerfile)
 - [`14`, `14.0.2-debian-10-r7` (14/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/14.0.2-debian-10-r7/14/debian-10/Dockerfile), [`14-prod`, `14.0.2-debian-10-r7-prod` (14/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/14.0.2-debian-10-r7/14/debian-10/prod/Dockerfile)
 - [`11-prod`, `11.0.8-prod-debian-10-r6` (11-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.8-prod-debian-10-r6/11-prod/debian-10/Dockerfile), [`11-prod-prod`, `11.0.8-prod-debian-10-r6-prod` (11-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.8-prod-debian-10-r6/11-prod/debian-10/prod/Dockerfile)
-- [`11`, `11.0.8-debian-10-r6` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.8-debian-10-r6/11/debian-10/Dockerfile), [`11-prod`, `11.0.8-debian-10-r6-prod` (11/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.8-debian-10-r6/11/debian-10/prod/Dockerfile)
+- [`11`, `11.0.8-debian-10-r7` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.8-debian-10-r7/11/debian-10/Dockerfile), [`11-prod`, `11.0.8-debian-10-r7-prod` (11/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.8-debian-10-r7/11/debian-10/prod/Dockerfile)
 - [`1.8-prod`, `1.8.262-prod-debian-10-r6` (1.8-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.262-prod-debian-10-r6/1.8-prod/debian-10/Dockerfile), [`1.8-prod-prod`, `1.8.262-prod-debian-10-r6-prod` (1.8-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.262-prod-debian-10-r6/1.8-prod/debian-10/prod/Dockerfile)
 - [`1.8`, `1.8.262-debian-10-r6` (1.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.262-debian-10-r6/1.8/debian-10/Dockerfile), [`1.8-prod`, `1.8.262-debian-10-r6-prod` (1.8/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.262-debian-10-r6/1.8/debian-10/prod/Dockerfile)