diff --git a/bitnami/grafana/13.1/debian-12/Dockerfile b/bitnami/grafana/13.1/debian-12/Dockerfile
index 1b110a055b09..db8f72a878ec 100644
--- a/bitnami/grafana/13.1/debian-12/Dockerfile
+++ b/bitnami/grafana/13.1/debian-12/Dockerfile
@@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="https://downloads.bitnami.com/files/stacksmith"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2026-06-25T12:03:07Z" \
+      org.opencontainers.image.created="2026-07-08T01:58:52Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/grafana/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/grafana" \
@@ -29,8 +29,8 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
       "mysql-client-12.3.2-1-linux-${OS_ARCH}-debian-12" \
-      "ini-file-1.4.9-12-linux-${OS_ARCH}-debian-12" \
-      "grafana-13.1.0-0-linux-${OS_ARCH}-debian-12" \
+      "ini-file-1.4.9-13-linux-${OS_ARCH}-debian-12" \
+      "grafana-13.1.0-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -50,7 +50,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/grafana/postunpack.sh
 ENV APP_VERSION="13.1.0" \
     BITNAMI_APP_NAME="grafana" \
-    IMAGE_REVISION="0" \
+    IMAGE_REVISION="1" \
     PATH="/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/grafana/bin:$PATH"
 
 EXPOSE 3000
diff --git a/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.1.0-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.1.0-0-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index 9ceb46ab6fb6..000000000000
--- a/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.1.0-0-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-c3beb3404c3de1a0b6d8854609e3b0ae3f535f23ae34677ed5de9db7c6381c42  grafana-13.1.0-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.1.0-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.1.0-0-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 58481cd3a160..000000000000
--- a/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.1.0-0-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-5ebdf770d5353405b578c8d3eb52a6280b81bae75c7e418a00e6c3b193ff03ba  grafana-13.1.0-0-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.1.0-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.1.0-1-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..4f47a4309fe8
--- /dev/null
+++ b/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.1.0-1-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+960c1caaefab16dcd460519e2a47163ed577f7d0d99759f53ae23b3805a0f91e  grafana-13.1.0-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.1.0-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.1.0-1-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..b0669dc6ed0c
--- /dev/null
+++ b/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.1.0-1-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+3823895805997747e14d3679fce04cd127dc870663898826c7c8a9aee2acd3a7  grafana-13.1.0-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index d07b04443b5d..000000000000
--- a/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-aba4a9b96e5a3b29743fe09c4b3279c789bace4171fe34574d166668dfc59523  ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index b5397259b807..000000000000
--- a/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-262a2d83e7294bb3adf0664ece04686f162a6355713981c7677634f2645505f0  ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..008faba52f43
--- /dev/null
+++ b/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+16c20658d1341bd5b925060c770e5007f8df19ce79bf73b3fedc5653c9b73a08  ini-file-1.4.9-13-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..6c8c65eeeef7
--- /dev/null
+++ b/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+07d509365514e811d0cd3727d33add8dcc9de3382e3220f7b839d617846e5e9e  ini-file-1.4.9-13-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index a8293800d55c..c1d60a5c5f42 100644
--- a/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/grafana/13.1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -424,3 +424,23 @@ EOF
 WantedBy=bitnami.service
 EOF
 }
+
+########################
+# Register a SIGTERM handler that forwards the signal to all child processes.
+# Should be called at the start of run.sh, before launching any background processes.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+service_register_term_forwarder() {
+    _service_forward_term() {
+        warn "Caught signal SIGTERM, passing it to child processes..."
+        pgrep -P $$ | xargs kill -TERM 2>/dev/null
+        wait
+        exit $?
+    }
+    trap _service_forward_term TERM
+}