diff --git a/bitnami/grafana/13.0/debian-12/Dockerfile b/bitnami/grafana/13.0/debian-12/Dockerfile
index 187102dff20f..1f7c70ce7dc3 100644
--- a/bitnami/grafana/13.0/debian-12/Dockerfile
+++ b/bitnami/grafana/13.0/debian-12/Dockerfile
@@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2026-05-25T09:49:21Z" \
+      org.opencontainers.image.created="2026-06-01T14:03:08Z" \
       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" \
@@ -28,19 +28,19 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "mysql-client-12.2.2-0-linux-${OS_ARCH}-debian-12" \
+      "mysql-client-12.3.2-0-linux-${OS_ARCH}-debian-12" \
       "ini-file-1.4.9-10-linux-${OS_ARCH}-debian-12" \
       "grafana-13.0.1-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
         curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \
-        curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \
       fi ; \
-      sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \
+      sha256sum -c "/opt/bitnami/checksums/${COMPONENT}.tar.gz.sha256" ; \
       tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \
-      rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
-    done
+      rm -rf "${COMPONENT}".tar.gz ; \
+    done ; \
+    rm -rf /opt/bitnami/checksums ;
 RUN 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
@@ -50,7 +50,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/grafana/postunpack.sh
 ENV APP_VERSION="13.0.1" \
     BITNAMI_APP_NAME="grafana" \
-    IMAGE_REVISION="7" \
+    IMAGE_REVISION="8" \
     PATH="/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/grafana/bin:$PATH"
 
 EXPOSE 3000
diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.1-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.1-1-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..b669dfe802ed
--- /dev/null
+++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.1-1-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+92dbc0589b5920b3cf168a93f38f45ead7ea6ca82e9fe08cf4fdd752533f4678  grafana-13.0.1-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.1-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.1-1-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..5083a8fd2a73
--- /dev/null
+++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.1-1-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+396c2baee8cf038bad96516201148287f793d2fdeaf09435077a1847be261e47  grafana-13.0.1-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..f7f6d777442b
--- /dev/null
+++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+7576302f2870643e4c48e7a4be12fef12e472e68b0b407e6033f812c8742c1f1  ini-file-1.4.9-10-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..fd41b7a8f0ce
--- /dev/null
+++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+83dd2355db6b63fc46bb02008fdace7510b339c88d91d45abaa256f2a7ae54bd  ini-file-1.4.9-10-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..2c4b9a209395
--- /dev/null
+++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+5b884dec9384b513fa919005e7db53fc817949bcbc3e88c61e49d12af6753a08  mysql-client-12.3.2-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..dd83bcc13e29
--- /dev/null
+++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+c6cd215fe18568f3015248adc87362e42edc3a9d342ec31be0ddc6e1abbf7c25  mysql-client-12.3.2-0-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh
index 1c69e0e48a5d..335c1c7c9ef7 100644
--- a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh
+++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh
@@ -139,3 +139,40 @@ wait_for_log_entry() {
         return 1
     fi
 }
+
+########################
+# Creates a secure temporary file containing the provided secret
+# Arguments:
+#   $1 - secret to write to the temporary file
+# Returns:
+#   String
+#########################
+credential_to_temp_file() {
+    local secret="$1"
+    local tmp_file
+
+    # Use mktemp with a specific prefix for easier debugging if something lingers
+    if ! tmp_file=$(mktemp "${TMPDIR:-/tmp}/at.cred.XXXXXXXX"); then
+        echo "Error: Failed to create temp file" >&2
+        return 1
+    fi
+
+    # Restrict permissions before writing the secret
+    chmod 0600 "$tmp_file"
+    # Write secret and ensure it's flushed to disk
+    printf "%s" "$secret" > "$tmp_file"
+    # Output the filename so the caller can capture it
+    echo "$tmp_file"
+}
+
+########################
+# Cleans up temporary files created by credential_to_temp_file
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+cleanup_credentials() {
+    debug "Cleaning up temporary files containing credentials"
+    rm -rf "${TMPDIR:-/tmp}"/at.cred.*
+}
diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh
index 1337f6c2dd59..b16efabd3230 100644
--- a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -131,6 +131,7 @@ relativize() {
 #   -d|--dir-mode - mode for files.
 #   -u|--user - user
 #   -g|--group - group
+#   -n|--no-dereference - do not follow symlinks (use for runtime root chown of daemon-writable dirs)
 # Returns:
 #   None
 #########################
@@ -140,6 +141,7 @@ configure_permissions_ownership() {
     local file_mode=""
     local user=""
     local group=""
+    local follow_symlinks="yes"
 
     # Validate arguments
     shift 1
@@ -161,6 +163,9 @@ configure_permissions_ownership() {
             shift
             group="${1:?missing group}"
             ;;
+        -n | --no-dereference)
+            follow_symlinks="no"
+            ;;
         *)
             echo "Invalid command line flag $1" >&2
             return 1
@@ -169,22 +174,29 @@ configure_permissions_ownership() {
         shift
     done
 
+    # -L: follow symlinks and emits the target path
+    # This is dangerous at runtime, given a co-located lower-privileged process with write access
+    # to the target path can redirect the chown/chmod to arbitrary paths. Example:
+    # Lower-privileged process run: ln -s /etc /tmp/etc
+    # Then, setup.sh runs: configure_permissions_ownership --dir-mode 775 /tmp
+    local find_L_flag=(); [[ "$follow_symlinks" == "yes" ]] && find_L_flag=("-L")
+    # -h: changes symlink inode ownership without touching the target.
+    local chown_flags=(); [[ "$follow_symlinks" == "no" ]] && chown_flags=("-h")
     read -r -a filepaths <<<"$paths"
     for p in "${filepaths[@]}"; do
         if [[ -e "$p" ]]; then
-            find -L "$p" -printf ""
             if [[ -n $dir_mode ]]; then
-                find -L "$p" -type d ! -perm "$dir_mode" -print0 | xargs -r -0 chmod "$dir_mode"
+                find "${find_L_flag[@]}" "$p" -not -type l -type d ! -perm "$dir_mode" -print0 | xargs -r -0 chmod "$dir_mode"
             fi
             if [[ -n $file_mode ]]; then
-                find -L "$p" -type f ! -perm "$file_mode" -print0 | xargs -r -0 chmod "$file_mode"
+                find "${find_L_flag[@]}" "$p" -not -type l -type f ! -perm "$file_mode" -print0 | xargs -r -0 chmod "$file_mode"
             fi
             if [[ -n $user ]] && [[ -n $group ]]; then
-                find -L "$p" -print0 | xargs -r -0 chown "${user}:${group}"
+                find "${find_L_flag[@]}" "$p" -print0 | xargs -r -0 chown "${chown_flags[@]}" "${user}:${group}"
             elif [[ -n $user ]] && [[ -z $group ]]; then
-                find -L "$p" -print0 | xargs -r -0 chown "${user}"
+                find "${find_L_flag[@]}" "$p" -print0 | xargs -r -0 chown "${chown_flags[@]}" "${user}"
             elif [[ -z $user ]] && [[ -n $group ]]; then
-                find -L "$p" -print0 | xargs -r -0 chgrp "${group}"
+                find "${find_L_flag[@]}" "$p" -print0 | xargs -r -0 chgrp "${chown_flags[@]}" "${group}"
             fi
         else
             stderr_print "$p does not exist"
diff --git a/bitnami/grafana/13.0/debian-12/rootfs/opt/bitnami/scripts/libgrafana.sh b/bitnami/grafana/13.0/debian-12/rootfs/opt/bitnami/scripts/libgrafana.sh
index 3cc75be438e6..d8eb700f3c0d 100644
--- a/bitnami/grafana/13.0/debian-12/rootfs/opt/bitnami/scripts/libgrafana.sh
+++ b/bitnami/grafana/13.0/debian-12/rootfs/opt/bitnami/scripts/libgrafana.sh
@@ -101,7 +101,7 @@ grafana_initialize() {
 
     if am_i_root; then
         for dir in "$GF_PATHS_DATA" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS"; do
-            is_mounted_dir_empty "$dir" && configure_permissions_ownership "$dir" -d "775" -f "664" -u "$GRAFANA_DAEMON_USER"
+            is_mounted_dir_empty "$dir" && configure_permissions_ownership "$dir" -d "775" -f "664" -u "$GRAFANA_DAEMON_USER" -n
         done
     fi