diff --git a/bitnami/grafana-tempo-query/1/debian-11/Dockerfile b/bitnami/grafana-tempo-query/1/debian-11/Dockerfile
index 8d2d220ab085..1189d94a003d 100644
--- a/bitnami/grafana-tempo-query/1/debian-11/Dockerfile
+++ b/bitnami/grafana-tempo-query/1/debian-11/Dockerfile
@@ -6,7 +6,7 @@ ENV HOME="/" \
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="1.5.0-debian-11-r2" \
+      org.opencontainers.image.ref.name="1.5.0-debian-11-r3" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/grafana-tempo-query" \
       org.opencontainers.image.title="grafana-tempo-query" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -15,15 +15,21 @@ LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # 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/jaeger-query-1.37.0-1-linux-amd64-debian-11.tar.gz && \
-    echo "4233cfa896c346f5ba5f4c561cd136861111869c35c654c84ba68a40694cc0c4  /tmp/bitnami/pkg/cache/jaeger-query-1.37.0-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/jaeger-query-1.37.0-1-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/jaeger-query-1.37.0-1-linux-amd64-debian-11.tar.gz
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/grafana-tempo-query-1.5.0-0-linux-amd64-debian-11.tar.gz && \
-    echo "f59b7c0e00a233929d8fcd613f7494350a483d823c4e0c76472e53f2c422d439  /tmp/bitnami/pkg/cache/grafana-tempo-query-1.5.0-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/grafana-tempo-query-1.5.0-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/grafana-tempo-query-1.5.0-0-linux-amd64-debian-11.tar.gz
+RUN install_packages ca-certificates curl gzip procps tar
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f jaeger-query-1.37.0-2-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/jaeger-query-1.37.0-2-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "58fb6b06417d0c4be4a9db9d16da976dffd7074f8d56d1d9895b4330885290c9  jaeger-query-1.37.0-2-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf jaeger-query-1.37.0-2-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \
+    rm -rf jaeger-query-1.37.0-2-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f grafana-tempo-query-1.5.0-1-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/grafana-tempo-query-1.5.0-1-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "a819ff36d3977799ce91c3371b4dc035e9f79b79bf849f21f4f061d0bc606163  grafana-tempo-query-1.5.0-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf grafana-tempo-query-1.5.0-1-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \
+    rm -rf grafana-tempo-query-1.5.0-1-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
diff --git a/bitnami/grafana-tempo-query/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-tempo-query/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index a4943769f6be..57fac466d82b 100644
--- a/bitnami/grafana-tempo-query/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/grafana-tempo-query/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,16 +1,16 @@
 {
     "grafana-tempo-query": {
         "arch": "amd64",
-        "digest": "f59b7c0e00a233929d8fcd613f7494350a483d823c4e0c76472e53f2c422d439",
+        "digest": "a819ff36d3977799ce91c3371b4dc035e9f79b79bf849f21f4f061d0bc606163",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.5.0-0"
+        "version": "1.5.0-1"
     },
     "jaeger-query": {
         "arch": "amd64",
-        "digest": "4233cfa896c346f5ba5f4c561cd136861111869c35c654c84ba68a40694cc0c4",
+        "digest": "58fb6b06417d0c4be4a9db9d16da976dffd7074f8d56d1d9895b4330885290c9",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.37.0-1"
+        "version": "1.37.0-2"
     }
 }
\ No newline at end of file
diff --git a/bitnami/grafana-tempo-query/README.md b/bitnami/grafana-tempo-query/README.md
index febbe02691d1..a62996cdc23f 100644
--- a/bitnami/grafana-tempo-query/README.md
+++ b/bitnami/grafana-tempo-query/README.md
@@ -28,7 +28,7 @@ $ docker run --name grafana-tempo-query bitnami/grafana-tempo-query: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/).
 
 
-* [`1`, `1-debian-11`, `1.5.0`, `1.5.0-debian-11-r2`, `latest` (1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/grafana-tempo-query/1/debian-11/Dockerfile)
+* [`1`, `1-debian-11`, `1.5.0`, `1.5.0-debian-11-r3`, `latest` (1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/grafana-tempo-query/1/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).