diff --git a/bitnami/wavefront-adapter-for-istio/0/debian-11/Dockerfile b/bitnami/wavefront-adapter-for-istio/0/debian-11/Dockerfile
new file mode 100644
index 000000000000..e1a8d128e4eb
--- /dev/null
+++ b/bitnami/wavefront-adapter-for-istio/0/debian-11/Dockerfile
@@ -0,0 +1,27 @@
+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 procps tar wget
+RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/wavefront-adapter-for-istio-0.1.5-0-linux-amd64-debian-11.tar.gz && \
+    echo "cec34ae877091421277c1d43bd2bef9db8eeae2915f1188f9c266145c67de65d  /tmp/bitnami/pkg/cache/wavefront-adapter-for-istio-0.1.5-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf /tmp/bitnami/pkg/cache/wavefront-adapter-for-istio-0.1.5-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
+    rm -rf /tmp/bitnami/pkg/cache/wavefront-adapter-for-istio-0.1.5-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
+
+ENV APP_VERSION="0.1.5" \
+    BITNAMI_APP_NAME="wavefront-adapter-for-istio" \
+    PATH="/opt/bitnami/wavefront-adapter-for-istio/bin:$PATH"
+
+EXPOSE 37671
+
+USER 1001
+ENTRYPOINT [ "wavefront" ]
diff --git a/bitnami/wavefront-adapter-for-istio/0/debian-11/docker-compose.yml b/bitnami/wavefront-adapter-for-istio/0/debian-11/docker-compose.yml
new file mode 100644
index 000000000000..0423557cfca9
--- /dev/null
+++ b/bitnami/wavefront-adapter-for-istio/0/debian-11/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '2'
+services:
+  wavefront-adapter-for-istio:
+    image: docker.io/bitnami/wavefront-adapter-for-istio:0
+    ports:
+      - '37671:37671'
diff --git a/bitnami/wavefront-adapter-for-istio/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wavefront-adapter-for-istio/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
new file mode 100644
index 000000000000..c3f4540c064c
--- /dev/null
+++ b/bitnami/wavefront-adapter-for-istio/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -0,0 +1,9 @@
+{
+    "wavefront-adapter-for-istio": {
+        "arch": "amd64",
+        "digest": "cec34ae877091421277c1d43bd2bef9db8eeae2915f1188f9c266145c67de65d",
+        "distro": "debian-11",
+        "type": "NAMI",
+        "version": "0.1.5-0"
+    }
+}
\ No newline at end of file
diff --git a/bitnami/wavefront-adapter-for-istio/0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/wavefront-adapter-for-istio/0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt
new file mode 100644
index 000000000000..c76ba31f3b8a
--- /dev/null
+++ b/bitnami/wavefront-adapter-for-istio/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/wavefront-adapter-for-istio/0/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/wavefront-adapter-for-istio/0/debian-11/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/wavefront-adapter-for-istio/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/wavefront-adapter-for-istio/README.md b/bitnami/wavefront-adapter-for-istio/README.md
index b1758ad795df..360408fbbbe6 100644
--- a/bitnami/wavefront-adapter-for-istio/README.md
+++ b/bitnami/wavefront-adapter-for-istio/README.md
@@ -32,7 +32,7 @@ $ docker run --name wavefront-adapter-for-istio bitnami/wavefront-adapter-for-is
 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.1.5`, `0.1.5-debian-10-r409`, `latest` (0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wavefront-adapter-for-istio/blob/0.1.5-debian-10-r409/0/debian-10/Dockerfile)
+* [`0`, `0-debian-11`, `0.1.5`, `0.1.5-debian-11-r0`, `latest` (0/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-wavefront-adapter-for-istio/blob/0.1.5-debian-11-r0/0/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wavefront-adapter-for-istio GitHub repo](https://github.com/bitnami/bitnami-docker-wavefront-adapter-for-istio).
 
@@ -53,7 +53,7 @@ $ docker pull bitnami/wavefront-adapter-for-istio:[TAG]
 If you wish, you can also build the image yourself.
 
 ```console
-$ docker build -t bitnami/wavefront-adapter-for-istio:latest 'https://github.com/bitnami/bitnami-docker-wavefront-adapter-for-istio.git#master:0/debian-10'
+$ docker build -t bitnami/wavefront-adapter-for-istio:latest 'https://github.com/bitnami/bitnami-docker-wavefront-adapter-for-istio.git#master:0/debian-11'
 ```
 
 ## Why use a non-root container?