diff --git a/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile b/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile
new file mode 100644
index 000000000000..d49a83f42370
--- /dev/null
+++ b/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile
@@ -0,0 +1,40 @@
+FROM docker.io/bitnami/minideb:bullseye
+LABEL maintainer "Bitnami <containers@bitnami.com>"
+
+ENV HOME="/" \
+    OS_ARCH="amd64" \
+    OS_FLAVOUR="debian-11" \
+    OS_NAME="linux"
+
+COPY prebuildfs /
+# Install required system packages and dependencies
+RUN install_packages ca-certificates curl gzip libc6 libgcc-s1 locales procps tar wget
+RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/java-1.8.333-0-linux-amd64-debian-11.tar.gz && \
+    echo "02a91d298bbe3bb5d240f635802a50b2970b19eba960c1804b7275f88a944bb3  /tmp/bitnami/pkg/cache/java-1.8.333-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf /tmp/bitnami/pkg/cache/java-1.8.333-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
+    rm -rf /tmp/bitnami/pkg/cache/java-1.8.333-0-linux-amd64-debian-11.tar.gz
+RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/spring-cloud-skipper-shell-2.8.4-0-linux-amd64-debian-11.tar.gz && \
+    echo "3c55ae4c3457cd24940d5da3d4edf22dac8cbab7c6bb687a3459224b0ecfc631  /tmp/bitnami/pkg/cache/spring-cloud-skipper-shell-2.8.4-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf /tmp/bitnami/pkg/cache/spring-cloud-skipper-shell-2.8.4-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
+    rm -rf /tmp/bitnami/pkg/cache/spring-cloud-skipper-shell-2.8.4-0-linux-amd64-debian-11.tar.gz
+RUN apt-get update && apt-get upgrade -y && \
+    rm -r /var/lib/apt/lists /var/cache/apt/archives
+RUN chmod g+rwX /opt/bitnami
+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_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
+RUN touch /opt/bitnami/spring-cloud-skipper-shell/spring-cloud-skipper-shell.log && chmod -R g+rwX /opt/bitnami/spring-cloud-skipper-shell
+
+COPY rootfs /
+RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
+ENV APP_VERSION="2.8.4" \
+    BITNAMI_APP_NAME="spring-cloud-skipper-shell" \
+    LANG="en_US.UTF-8" \
+    LANGUAGE="en_US:en" \
+    PATH="/opt/bitnami/java/bin:$PATH"
+
+WORKDIR /opt/bitnami/spring-cloud-skipper-shell
+USER 1001
+ENTRYPOINT [ "/opt/bitnami/java/bin/java", "-jar", "/opt/bitnami/spring-cloud-skipper-shell/spring-cloud-skipper-shell.jar" ]
+CMD [ "--help" ]
diff --git a/bitnami/spring-cloud-skipper-shell/2/debian-11/docker-compose.yml b/bitnami/spring-cloud-skipper-shell/2/debian-11/docker-compose.yml
new file mode 100644
index 000000000000..8d8316b49bd7
--- /dev/null
+++ b/bitnami/spring-cloud-skipper-shell/2/debian-11/docker-compose.yml
@@ -0,0 +1,5 @@
+version: '2'
+
+services:
+  spring-cloud-skipper-shell:
+    image: docker.io/bitnami/spring-cloud-skipper-shell:2
diff --git a/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
new file mode 100644
index 000000000000..6455b63080ae
--- /dev/null
+++ b/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -0,0 +1,16 @@
+{
+    "java": {
+        "arch": "amd64",
+        "digest": "02a91d298bbe3bb5d240f635802a50b2970b19eba960c1804b7275f88a944bb3",
+        "distro": "debian-11",
+        "type": "NAMI",
+        "version": "1.8.333-0"
+    },
+    "spring-cloud-skipper-shell": {
+        "arch": "amd64",
+        "digest": "3c55ae4c3457cd24940d5da3d4edf22dac8cbab7c6bb687a3459224b0ecfc631",
+        "distro": "debian-11",
+        "type": "NAMI",
+        "version": "2.8.4-0"
+    }
+}
\ No newline at end of file
diff --git a/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt
new file mode 100644
index 000000000000..c76ba31f3b8a
--- /dev/null
+++ b/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt
@@ -0,0 +1,3 @@
+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/spring-cloud-skipper-shell/2/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/usr/sbin/install_packages
@@ -0,0 +1,24 @@
+#!/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/spring-cloud-skipper-shell/2/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh b/bitnami/spring-cloud-skipper-shell/2/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
new file mode 100755
index 000000000000..de3120bd8ec0
--- /dev/null
+++ b/bitnami/spring-cloud-skipper-shell/2/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
@@ -0,0 +1,44 @@
+#!/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/spring-cloud-skipper-shell/README.md b/bitnami/spring-cloud-skipper-shell/README.md
index afc61409f2c4..9e9bab1cf26e 100644
--- a/bitnami/spring-cloud-skipper-shell/README.md
+++ b/bitnami/spring-cloud-skipper-shell/README.md
@@ -28,7 +28,7 @@ $ docker run --name spring-cloud-skipper-shell bitnami/spring-cloud-skipper-shel
 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/).
 
 
-* [`2`, `2-debian-10`, `2.8.4`, `2.8.4-debian-10-r59`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-skipper-shell/blob/2.8.4-debian-10-r59/2/debian-10/Dockerfile)
+* [`2`, `2-debian-11`, `2.8.4`, `2.8.4-debian-11-r0`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-skipper-shell/blob/2.8.4-debian-11-r0/2/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/spring-cloud-skipper-shell GitHub repo](https://github.com/bitnami/bitnami-docker-spring-cloud-skipper-shell).
 
@@ -49,7 +49,7 @@ $ docker pull bitnami/spring-cloud-skipper-shell:[TAG]
 If you wish, you can also build the image yourself.
 
 ```console
-$ docker build -t bitnami/spring-cloud-skipper-shell:latest 'https://github.com/bitnami/bitnami-docker-spring-cloud-skipper-shell.git#master:2/debian-10'
+$ docker build -t bitnami/spring-cloud-skipper-shell:latest 'https://github.com/bitnami/bitnami-docker-spring-cloud-skipper-shell.git#master:2/debian-11'
 ```
 
 ## Configuration