diff --git a/bitnami/thanos/0/scratch/Dockerfile b/bitnami/thanos/0/scratch/Dockerfile
index 2aca752d061c..26db8e8e81f6 100644
--- a/bitnami/thanos/0/scratch/Dockerfile
+++ b/bitnami/thanos/0/scratch/Dockerfile
@@ -9,15 +9,20 @@ COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl gzip tar
+RUN install_packages ca-certificates curl
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f thanos-0.28.0-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/thanos-0.28.0-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/thanos-0.28.0-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c thanos-0.28.0-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf thanos-0.28.0-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf thanos-0.28.0-0-linux-${OS_ARCH}-debian-11.tar.gz
+    COMPONENTS=( \
+      "thanos-0.28.0-0-linux-${OS_ARCH}-debian-11" \
+    ) && \
+    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
 
 ######
 
@@ -29,7 +34,7 @@ ENV OS_ARCH="${TARGETARCH:-amd64}"
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="0.28.0-scratch-r1" \
+      org.opencontainers.image.ref.name="0.28.0-scratch-r2" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/thanos" \
       org.opencontainers.image.title="thanos" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/thanos/README.md b/bitnami/thanos/README.md
index 2f772385a374..8f54e66abd09 100644
--- a/bitnami/thanos/README.md
+++ b/bitnami/thanos/README.md
@@ -42,7 +42,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-scratch`, `0.28.0`, `0.28.0-scratch-r1`, `latest` (0/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/thanos/0/scratch/Dockerfile)
+* [`0`, `0-scratch`, `0.28.0`, `0.28.0-scratch-r2`, `latest` (0/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/thanos/0/scratch/Dockerfile)
 
 ## Connecting to other containers