diff --git a/bitnami/grafana-tempo/2/debian-12/Dockerfile b/bitnami/grafana-tempo/2/debian-12/Dockerfile
new file mode 100644
index 000000000000..ae161e7d3a98
--- /dev/null
+++ b/bitnami/grafana-tempo/2/debian-12/Dockerfile
@@ -0,0 +1,53 @@
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
+FROM docker.io/bitnami/minideb:bookworm
+
+ARG TARGETARCH
+
+LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
+      org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
+      org.opencontainers.image.created="2024-02-20T03:49:10Z" \
+      org.opencontainers.image.description="Application packaged by VMware, Inc" \
+      org.opencontainers.image.licenses="Apache-2.0" \
+      org.opencontainers.image.ref.name="2.3.1-debian-12-r12" \
+      org.opencontainers.image.title="grafana-tempo" \
+      org.opencontainers.image.vendor="VMware, Inc." \
+      org.opencontainers.image.version="2.3.1"
+
+ENV HOME="/" \
+    OS_ARCH="${TARGETARCH:-amd64}" \
+    OS_FLAVOUR="debian-12" \
+    OS_NAME="linux"
+
+COPY prebuildfs /
+SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
+# Install required system packages and dependencies
+RUN install_packages ca-certificates curl procps
+RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
+    COMPONENTS=( \
+      "grafana-tempo-2.3.1-6-linux-${OS_ARCH}-debian-12" \
+    ) ; \
+    for COMPONENT in "${COMPONENTS[@]}"; do \
+      if [ ! -f "${COMPONENT}.tar.gz" ]; then \
+        curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \
+        curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \
+      fi ; \
+      sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \
+      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \
+      rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
+    done
+RUN apt-get autoremove --purge -y curl && \
+    apt-get update && apt-get upgrade -y && \
+    apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
+RUN chmod g+rwX /opt/bitnami
+RUN mkdir -p /bitnami/grafana-tempo && chmod g+rwX /bitnami/grafana-tempo
+RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
+
+ENV APP_VERSION="2.3.1" \
+    BITNAMI_APP_NAME="grafana-tempo" \
+    PATH="/opt/bitnami/grafana-tempo/bin:$PATH"
+
+USER 1001
+ENTRYPOINT [ "tempo" ]
+CMD [ "-config.file=/bitnami/grafana-tempo/conf/tempo.yaml" ]
diff --git a/bitnami/grafana-tempo/2/debian-12/examples/tempo.yaml b/bitnami/grafana-tempo/2/debian-12/examples/tempo.yaml
new file mode 100644
index 000000000000..0afa036431a4
--- /dev/null
+++ b/bitnami/grafana-tempo/2/debian-12/examples/tempo.yaml
@@ -0,0 +1,46 @@
+server:
+  http_listen_port: 3200
+
+distributor:
+  receivers:                           # this configuration will listen on all ports and protocols that tempo is capable of.
+    jaeger:                            # the receives all come from the OpenTelemetry collector.  more configuration information can
+      protocols:                       # be found there: https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver
+        thrift_http:                   #
+        grpc:                          # for a production deployment you should only enable the receivers you need!
+        thrift_binary:
+        thrift_compact:
+    zipkin:
+    otlp:
+      protocols:
+        http:
+        grpc:
+    opencensus:
+
+ingester:
+  max_block_duration: 5m               # cut the headblock when this much time passes. this is being set for demo purposes and should probably be left alone normally
+
+compactor:
+  compaction:
+    block_retention: 1h                # overall Tempo trace retention. set for demo purposes
+
+metrics_generator:
+  registry:
+    external_labels:
+      source: tempo
+      cluster: docker-compose
+  storage:
+    path: /tmp/tempo/generator/wal
+    remote_write:
+      - url: http://prometheus:9090/api/v1/write
+        send_exemplars: true
+
+storage:
+  trace:
+    backend: local                     # backend configuration to use
+    wal:
+      path: /tmp/tempo/wal             # where to store the the wal locally
+    local:
+      path: /tmp/tempo/blocks
+
+overrides:
+  metrics_generator_processors: [service-graphs, span-metrics] # enables metrics generator
diff --git a/bitnami/grafana-tempo/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-tempo/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
new file mode 100644
index 000000000000..3ceb5ab75ea8
--- /dev/null
+++ b/bitnami/grafana-tempo/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -0,0 +1,8 @@
+{
+    "grafana-tempo": {
+        "arch": "amd64",
+        "distro": "debian-12",
+        "type": "NAMI",
+        "version": "2.3.1-6"
+    }
+}
\ No newline at end of file
diff --git a/bitnami/grafana-tempo/2/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/grafana-tempo/2/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt
new file mode 100644
index 000000000000..76956b38e82c
--- /dev/null
+++ b/bitnami/grafana-tempo/2/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt
@@ -0,0 +1,2 @@
+Bitnami containers ship with software bundles. You can find the licenses under:
+/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt
diff --git a/bitnami/grafana-tempo/2/debian-12/prebuildfs/usr/sbin/install_packages b/bitnami/grafana-tempo/2/debian-12/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..acbc3173208c
--- /dev/null
+++ b/bitnami/grafana-tempo/2/debian-12/prebuildfs/usr/sbin/install_packages
@@ -0,0 +1,27 @@
+#!/bin/sh
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+set -eu
+
+n=0
+max=2
+export DEBIAN_FRONTEND=noninteractive
+
+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
+apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/grafana-tempo/2/debian-12/prebuildfs/usr/sbin/run-script b/bitnami/grafana-tempo/2/debian-12/prebuildfs/usr/sbin/run-script
new file mode 100755
index 000000000000..4ca0f897277e
--- /dev/null
+++ b/bitnami/grafana-tempo/2/debian-12/prebuildfs/usr/sbin/run-script
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+set -u
+
+if [ $# -eq 0 ]; then
+    >&2 echo "No arguments provided"
+    exit 1
+fi
+
+script=$1
+exit_code="${2:-96}"
+fail_if_not_present="${3:-n}"
+
+if test -f "$script"; then
+  sh $script
+
+  if [ $? -ne 0 ]; then
+    exit $((exit_code))
+  fi
+elif [ "$fail_if_not_present" = "y" ]; then
+  >&2 echo "script not found: $script"
+  exit 127
+fi
diff --git a/bitnami/grafana-tempo/2/debian-12/tags-info.yaml b/bitnami/grafana-tempo/2/debian-12/tags-info.yaml
new file mode 100644
index 000000000000..d152314990e5
--- /dev/null
+++ b/bitnami/grafana-tempo/2/debian-12/tags-info.yaml
@@ -0,0 +1,5 @@
+rolling-tags:
+- "2"
+- 2-debian-12
+- 2.3.1
+- latest