diff --git a/bitnami/grafana-loki/2/debian-11/Dockerfile b/bitnami/grafana-loki/2/debian-11/Dockerfile
new file mode 100644
index 000000000000..3e8ba1f82557
--- /dev/null
+++ b/bitnami/grafana-loki/2/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/grafana-loki-2.5.0-0-linux-amd64-debian-11.tar.gz && \
+    echo "8281b104ce19feeab4577a947522b19a6b8f29cb791bcaeb5df4b756a4874d5e  /tmp/bitnami/pkg/cache/grafana-loki-2.5.0-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf /tmp/bitnami/pkg/cache/grafana-loki-2.5.0-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
+    rm -rf /tmp/bitnami/pkg/cache/grafana-loki-2.5.0-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 mkdir -p /bitnami/grafana-loki/data /bitnami/grafana-loki/loki /bitnami/grafana-loki/wal && chmod -R g+rwX /bitnami/grafana-loki && ln -s  /bitnami/grafana-loki/loki /loki && ln -s /bitnami/grafana-loki/data /data && ln -s /bitnami/grafana-loki/wal /wal
+
+ENV APP_VERSION="2.5.0" \
+    BITNAMI_APP_NAME="grafana-loki" \
+    PATH="/opt/bitnami/grafana-loki/bin:$PATH"
+
+EXPOSE 3100
+
+USER 1001
+ENTRYPOINT [ "loki" ]
+CMD [ "-config.file=/bitnami/grafana-loki/conf/loki.yaml" ]
diff --git a/bitnami/grafana-loki/2/debian-11/docker-compose.yml b/bitnami/grafana-loki/2/debian-11/docker-compose.yml
new file mode 100644
index 000000000000..22bd26f3afa2
--- /dev/null
+++ b/bitnami/grafana-loki/2/debian-11/docker-compose.yml
@@ -0,0 +1,4 @@
+version: '2'
+services:
+  grafana-loki:
+    image: docker.io/bitnami/grafana-loki:2
diff --git a/bitnami/grafana-loki/2/debian-11/examples/loki.yaml b/bitnami/grafana-loki/2/debian-11/examples/loki.yaml
new file mode 100644
index 000000000000..807095ae0235
--- /dev/null
+++ b/bitnami/grafana-loki/2/debian-11/examples/loki.yaml
@@ -0,0 +1,70 @@
+# This is a configuration to deploy Loki depending only on a storage solution
+# for example, an S3-compatible API like MinIO.
+# The ring configuration is based on the gossip memberlist and the index is shipped to storage
+# via Single Store (boltdb-shipper)
+
+auth_enabled: false
+
+server:
+  http_listen_port: 3100
+
+distributor:
+  ring:
+    kvstore:
+      store: memberlist
+
+ingester:
+  lifecycler:
+    ring:
+      kvstore:
+        store: memberlist
+      replication_factor: 1
+    final_sleep: 0s
+  chunk_idle_period: 5m
+  chunk_retain_period: 30s
+
+memberlist:
+  abort_if_cluster_join_fails: false
+
+  # Expose this port on all distributor, ingester
+  # and querier replicas.
+  bind_port: 7946
+
+  # You can use a headless k8s service for all distributor,
+  # ingester and querier components.
+  join_members:
+  - loki-gossip-ring.loki.svc.cluster.local:7946
+
+  max_join_backoff: 1m
+  max_join_retries: 10
+  min_join_backoff: 1s
+
+schema_config:
+  configs:
+  - from: 2020-05-15
+    store: boltdb-shipper
+    object_store: s3
+    schema: v11
+    index:
+      prefix: index_
+      period: 24h
+
+storage_config:
+ boltdb_shipper:
+   active_index_directory: /loki/index
+   cache_location: /loki/index_cache
+   shared_store: s3
+
+ aws:
+   s3: s3://access_key:secret_access_key@custom_endpoint/bucket_name
+   s3forcepathstyle: true
+
+limits_config:
+  enforce_metric_name: false
+  reject_old_samples: true
+  reject_old_samples_max_age: 168h
+
+compactor:
+  working_directory: /data/compactor
+  shared_store: s3
+  compaction_interval: 5m
diff --git a/bitnami/grafana-loki/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-loki/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
new file mode 100644
index 000000000000..451a4422aca5
--- /dev/null
+++ b/bitnami/grafana-loki/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -0,0 +1,9 @@
+{
+    "grafana-loki": {
+        "arch": "amd64",
+        "digest": "8281b104ce19feeab4577a947522b19a6b8f29cb791bcaeb5df4b756a4874d5e",
+        "distro": "debian-11",
+        "type": "NAMI",
+        "version": "2.5.0-0"
+    }
+}
\ No newline at end of file
diff --git a/bitnami/grafana-loki/2/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/grafana-loki/2/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt
new file mode 100644
index 000000000000..c76ba31f3b8a
--- /dev/null
+++ b/bitnami/grafana-loki/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/grafana-loki/2/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/grafana-loki/2/debian-11/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/grafana-loki/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/grafana-loki/README.md b/bitnami/grafana-loki/README.md
index 060f762731d5..1931a0240d59 100644
--- a/bitnami/grafana-loki/README.md
+++ b/bitnami/grafana-loki/README.md
@@ -28,7 +28,7 @@ $ docker run --name grafana-loki bitnami/grafana-loki: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/).
 
 
-* [`2`, `2-debian-10`, `2.5.0`, `2.5.0-debian-10-r18`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana-loki/blob/2.5.0-debian-10-r18/2/debian-10/Dockerfile)
+* [`2`, `2-debian-11`, `2.5.0`, `2.5.0-debian-11-r0`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana-loki/blob/2.5.0-debian-11-r0/2/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/grafana-loki GitHub repo](https://github.com/bitnami/bitnami-docker-grafana-loki).
 
@@ -49,7 +49,7 @@ $ docker pull bitnami/grafana-loki:[TAG]
 If you wish, you can also build the image yourself.
 
 ```console
-$ docker build -t bitnami/grafana-loki:latest 'https://github.com/bitnami/bitnami-docker-grafana-loki.git#master:2/debian-10'
+$ docker build -t bitnami/grafana-loki:latest 'https://github.com/bitnami/bitnami-docker-grafana-loki.git#master:2/debian-11'
 ```
 
 ## Why use a non-root container?