diff --git a/bitnami/java/15-prod/debian-10/Dockerfile b/bitnami/java/15-prod/debian-10/Dockerfile
deleted file mode 100644
index 76335b242eb8..000000000000
--- a/bitnami/java/15-prod/debian-10/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-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 libgcc1 libstdc++6 locales procps tar wget zlib1g
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/java-15.0.2-0-linux-amd64-debian-10.tar.gz && \
-    echo "73f9e68a1fbd6a2171b76f732a6244fbf821aeac272512f4a1f1dad6e3f5b026  /tmp/bitnami/pkg/cache/java-15.0.2-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/java-15.0.2-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/java-15.0.2-0-linux-amd64-debian-10.tar.gz
-RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
-RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \
-    DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales
-RUN echo 'en_GB.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
-RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
-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="15.0.2-prod-debian-10-r98" \
-    JAVA_HOME="/opt/bitnami/java" \
-    LANG="en_US.UTF-8" \
-    LANGUAGE="en_US:en" \
-    PATH="/opt/bitnami/java/bin:$PATH"
-
-CMD [ "bash" ]
diff --git a/bitnami/java/15-prod/debian-10/docker-compose.yml b/bitnami/java/15-prod/debian-10/docker-compose.yml
deleted file mode 100644
index f820d362928d..000000000000
--- a/bitnami/java/15-prod/debian-10/docker-compose.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: '2'
-
-services:
-  java:
-    tty: true # Enables debugging capabilities when attached to this container.
-    image: docker.io/bitnami/java:15-prod
-    command: ["tail", "-f", "/dev/null"] # To keep the container running
-    ports:
-      - 8080:8080
-    volumes:
-      - .:/app
diff --git a/bitnami/java/15-prod/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/java/15-prod/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
deleted file mode 100644
index 11483bc375b2..000000000000
--- a/bitnami/java/15-prod/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "java": {
-        "arch": "amd64",
-        "digest": "73f9e68a1fbd6a2171b76f732a6244fbf821aeac272512f4a1f1dad6e3f5b026",
-        "distro": "debian-10",
-        "type": "NAMI",
-        "version": "15.0.2-0"
-    }
-}
\ No newline at end of file
diff --git a/bitnami/java/15-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/java/15-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt
deleted file mode 100644
index c76ba31f3b8a..000000000000
--- a/bitnami/java/15-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Bitnami containers ship with software bundles. You can find the licenses under:
-/opt/bitnami/nami/COPYING
-/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt
diff --git a/bitnami/java/15-prod/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/java/15-prod/debian-10/prebuildfs/usr/sbin/install_packages
deleted file mode 100755
index c9577647443b..000000000000
--- a/bitnami/java/15-prod/debian-10/prebuildfs/usr/sbin/install_packages
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-export DEBIAN_FRONTEND=noninteractive
-n=0
-max=2
-until [ $n -gt $max ]; do
-    set +e
-    (
-      apt-get update -qq &&
-      apt-get install -y --no-install-recommends "$@"
-    )
-    CODE=$?
-    set -e
-    if [ $CODE -eq 0 ]; then
-        break
-    fi
-    if [ $n -eq $max ]; then
-        exit $CODE
-    fi
-    echo "apt failed, retrying"
-    n=$(($n + 1))
-done
-rm -r /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/java/15-prod/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh b/bitnami/java/15-prod/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
deleted file mode 100755
index de3120bd8ec0..000000000000
--- a/bitnami/java/15-prod/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/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
-    # 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}"
-        enable_locale "$locale"
-    done <<< "$LOCALES_TO_ADD"
-fi
-
-locale-gen
diff --git a/bitnami/java/15/debian-10/Dockerfile b/bitnami/java/15/debian-10/Dockerfile
deleted file mode 100644
index 23727204a21c..000000000000
--- a/bitnami/java/15/debian-10/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-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 libgcc1 libsqlite3-dev libssl-dev libstdc++6 locales procps tar wget zlib1g
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/java-15.0.2-0-linux-amd64-debian-10.tar.gz && \
-    echo "73f9e68a1fbd6a2171b76f732a6244fbf821aeac272512f4a1f1dad6e3f5b026  /tmp/bitnami/pkg/cache/java-15.0.2-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/java-15.0.2-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/java-15.0.2-0-linux-amd64-debian-10.tar.gz
-RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
-RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \
-    DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales
-RUN echo 'en_GB.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
-RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
-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="15.0.2-debian-10-r97" \
-    JAVA_HOME="/opt/bitnami/java" \
-    LANG="en_US.UTF-8" \
-    LANGUAGE="en_US:en" \
-    PATH="/opt/bitnami/java/bin:$PATH"
-
-CMD [ "bash" ]
diff --git a/bitnami/java/15/debian-10/docker-compose.yml b/bitnami/java/15/debian-10/docker-compose.yml
deleted file mode 100644
index 8b97fb20a30f..000000000000
--- a/bitnami/java/15/debian-10/docker-compose.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: '2'
-
-services:
-  java:
-    tty: true # Enables debugging capabilities when attached to this container.
-    image: docker.io/bitnami/java:15
-    command: ["tail", "-f", "/dev/null"] # To keep the container running
-    ports:
-      - 8080:8080
-    volumes:
-      - .:/app
diff --git a/bitnami/java/15/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/java/15/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
deleted file mode 100644
index 11483bc375b2..000000000000
--- a/bitnami/java/15/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "java": {
-        "arch": "amd64",
-        "digest": "73f9e68a1fbd6a2171b76f732a6244fbf821aeac272512f4a1f1dad6e3f5b026",
-        "distro": "debian-10",
-        "type": "NAMI",
-        "version": "15.0.2-0"
-    }
-}
\ No newline at end of file
diff --git a/bitnami/java/15/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/java/15/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt
deleted file mode 100644
index c76ba31f3b8a..000000000000
--- a/bitnami/java/15/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Bitnami containers ship with software bundles. You can find the licenses under:
-/opt/bitnami/nami/COPYING
-/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt
diff --git a/bitnami/java/15/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/java/15/debian-10/prebuildfs/usr/sbin/install_packages
deleted file mode 100755
index c9577647443b..000000000000
--- a/bitnami/java/15/debian-10/prebuildfs/usr/sbin/install_packages
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-export DEBIAN_FRONTEND=noninteractive
-n=0
-max=2
-until [ $n -gt $max ]; do
-    set +e
-    (
-      apt-get update -qq &&
-      apt-get install -y --no-install-recommends "$@"
-    )
-    CODE=$?
-    set -e
-    if [ $CODE -eq 0 ]; then
-        break
-    fi
-    if [ $n -eq $max ]; then
-        exit $CODE
-    fi
-    echo "apt failed, retrying"
-    n=$(($n + 1))
-done
-rm -r /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/java/15/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh b/bitnami/java/15/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
deleted file mode 100755
index de3120bd8ec0..000000000000
--- a/bitnami/java/15/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/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
-    # 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}"
-        enable_locale "$locale"
-    done <<< "$LOCALES_TO_ADD"
-fi
-
-locale-gen