diff --git a/bitnami/metrics-server/0/debian-11/Dockerfile b/bitnami/metrics-server/0/debian-11/Dockerfile
new file mode 100644
index 000000000000..f9feb87f6e71
--- /dev/null
+++ b/bitnami/metrics-server/0/debian-11/Dockerfile
@@ -0,0 +1,29 @@
+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 procps tar wget
+RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/metrics-server-0.6.1-0-linux-amd64-debian-11.tar.gz && \
+    echo "b7b1f7695f91eb7537c3a0c693573eba214aa744c396c1f7162b590e514fadd2  /tmp/bitnami/pkg/cache/metrics-server-0.6.1-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf /tmp/bitnami/pkg/cache/metrics-server-0.6.1-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
+    rm -rf /tmp/bitnami/pkg/cache/metrics-server-0.6.1-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 chown -R 1001:root /opt/bitnami/metrics-server && chmod -R g+rwX /opt/bitnami/metrics-server
+ENV APP_VERSION="0.6.1" \
+    BITNAMI_APP_NAME="metrics-server" \
+    PATH="/opt/bitnami/metrics-server/bin:$PATH"
+
+EXPOSE 8443
+
+WORKDIR /opt/bitnami/metrics-server
+USER 1001
+ENTRYPOINT [ "metrics-server", "--secure-port=8443", "--cert-dir=/opt/bitnami/metrics-server/certificates" ]
diff --git a/bitnami/metrics-server/0/debian-11/docker-compose.yml b/bitnami/metrics-server/0/debian-11/docker-compose.yml
new file mode 100644
index 000000000000..35dbae257473
--- /dev/null
+++ b/bitnami/metrics-server/0/debian-11/docker-compose.yml
@@ -0,0 +1,7 @@
+version: '2'
+
+services:
+  metrics-server:
+    image: docker.io/bitnami/metrics-server:0
+    ports:
+      - '8443:8443'
diff --git a/bitnami/metrics-server/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/metrics-server/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
new file mode 100644
index 000000000000..bda3b33f7be9
--- /dev/null
+++ b/bitnami/metrics-server/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -0,0 +1,9 @@
+{
+    "metrics-server": {
+        "arch": "amd64",
+        "digest": "b7b1f7695f91eb7537c3a0c693573eba214aa744c396c1f7162b590e514fadd2",
+        "distro": "debian-11",
+        "type": "NAMI",
+        "version": "0.6.1-0"
+    }
+}
\ No newline at end of file
diff --git a/bitnami/metrics-server/0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/metrics-server/0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt
new file mode 100644
index 000000000000..c76ba31f3b8a
--- /dev/null
+++ b/bitnami/metrics-server/0/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/metrics-server/0/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/metrics-server/0/debian-11/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/metrics-server/0/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/metrics-server/README.md b/bitnami/metrics-server/README.md
index e4a447be8330..f591d6829702 100644
--- a/bitnami/metrics-server/README.md
+++ b/bitnami/metrics-server/README.md
@@ -40,7 +40,7 @@ Non-root container images add an extra layer of security and are generally recom
 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/).
 
 
-* [`0`, `0-debian-10`, `0.6.1`, `0.6.1-debian-10-r111`, `latest` (0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-metrics-server/blob/0.6.1-debian-10-r111/0/debian-10/Dockerfile)
+* [`0`, `0-debian-11`, `0.6.1`, `0.6.1-debian-11-r0`, `latest` (0/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-metrics-server/blob/0.6.1-debian-11-r0/0/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/metrics-server GitHub repo](https://github.com/bitnami/bitnami-docker-metrics-server).