diff --git a/bitnami/bitnami-shell/11/debian-11/Dockerfile b/bitnami/bitnami-shell/11/debian-11/Dockerfile
new file mode 100644
index 000000000000..80ecd70b4094
--- /dev/null
+++ b/bitnami/bitnami-shell/11/debian-11/Dockerfile
@@ -0,0 +1,15 @@
+FROM docker.io/bitnami/minideb:bullseye
+LABEL maintainer "Bitnami <containers@bitnami.com>"
+
+COPY prebuildfs /
+# Install required system packages and dependencies
+RUN install_packages curl procps
+RUN apt-get update && apt-get upgrade -y && \
+    rm -r /var/lib/apt/lists /var/cache/apt/archives
+
+ENV APP_VERSION="11" \
+    BITNAMI_APP_NAME="bitnami-shell" \
+    OS_ARCH="amd64" \
+    OS_FLAVOUR="debian-11" \
+    OS_NAME="linux"
+
diff --git a/bitnami/bitnami-shell/11/debian-11/docker-compose.yml b/bitnami/bitnami-shell/11/debian-11/docker-compose.yml
new file mode 100644
index 000000000000..e51c62bd993d
--- /dev/null
+++ b/bitnami/bitnami-shell/11/debian-11/docker-compose.yml
@@ -0,0 +1,4 @@
+version: '2'
+services:
+  bitnami-shell:
+    image: docker.io/bitnami/bitnami-shell:11
diff --git a/bitnami/bitnami-shell/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/bitnami-shell/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
new file mode 100644
index 000000000000..0e0dcd235c49
--- /dev/null
+++ b/bitnami/bitnami-shell/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -0,0 +1,3 @@
+{
+
+}
\ No newline at end of file
diff --git a/bitnami/bitnami-shell/11/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/bitnami-shell/11/debian-11/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/bitnami-shell/11/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/bitnami-shell/README.md b/bitnami/bitnami-shell/README.md
index d59a72019fb2..8105ccfbcc25 100644
--- a/bitnami/bitnami-shell/README.md
+++ b/bitnami/bitnami-shell/README.md
@@ -28,7 +28,7 @@ $ docker run --name bitnami-shell bitnami/bitnami-shell:latest
 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/).
 
 
-* [`10`, `10-debian-10`, `10-debian-10-r446`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-bitnami-shell/blob/10-debian-10-r446/10/debian-10/Dockerfile)
+* [`11`, `11-debian-11`, `11-debian-11-r0`, `latest` (11/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-bitnami-shell/blob/11-debian-11-r0/11/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/bitnami-shell GitHub repo](https://github.com/bitnami/bitnami-docker-bitnami-shell).
 
@@ -49,7 +49,7 @@ $ docker pull bitnami/bitnami-shell:[TAG]
 If you wish, you can also build the image yourself.
 
 ```console
-$ docker build -t bitnami/bitnami-shell:latest 'https://github.com/bitnami/bitnami-docker-bitnami-shell.git#master:10/debian-10'
+$ docker build -t bitnami/bitnami-shell:latest 'https://github.com/bitnami/bitnami-docker-bitnami-shell.git#master:11/debian-11'
 ```
 
 ## Configuration