diff --git a/bitnami/grafana/CHANGELOG.md b/bitnami/grafana/CHANGELOG.md
index cd955ba402..7350bf0c27 100644
--- a/bitnami/grafana/CHANGELOG.md
+++ b/bitnami/grafana/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 12.0.2 (2025-05-15)
+## 12.0.3 (2025-05-16)
 
-* [bitnami/grafana] fix metrics namespace include ([#33714](https://github.com/bitnami/charts/pull/33714))
+* [bitnami/grafana] Deterministic admin password secret + saving password for future uses if .Values.admin.password is not set ([#33672](https://github.com/bitnami/charts/pull/33672))
+
+## <small>12.0.2 (2025-05-15)</small>
+
+* [bitnami/grafana] fix metrics namespace include (#33714) ([5a23570](https://github.com/bitnami/charts/commit/5a23570b164643efc1c55ae8aed6bc586a9738be)), closes [#33714](https://github.com/bitnami/charts/issues/33714)
 
 ## <small>12.0.1 (2025-05-15)</small>
 
diff --git a/bitnami/grafana/Chart.yaml b/bitnami/grafana/Chart.yaml
index d65ed4630a..633394c16e 100644
--- a/bitnami/grafana/Chart.yaml
+++ b/bitnami/grafana/Chart.yaml
@@ -33,4 +33,4 @@ maintainers:
 name: grafana
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/grafana
-version: 12.0.2
+version: 12.0.3
diff --git a/bitnami/grafana/templates/secret.yaml b/bitnami/grafana/templates/secret.yaml
index c4df14c141..6c3c87129d 100644
--- a/bitnami/grafana/templates/secret.yaml
+++ b/bitnami/grafana/templates/secret.yaml
@@ -16,5 +16,5 @@ metadata:
   {{- end }}
 type: Opaque
 data:
-  GF_SECURITY_ADMIN_PASSWORD: {{ ternary (randAlphaNum 10) .Values.admin.password (empty .Values.admin.password) | b64enc | quote }}
+  GF_SECURITY_ADMIN_PASSWORD: {{ include "common.secrets.passwords.manage" (dict "secret" (printf "%s-admin" (include "common.names.fullname" .)) "key" "GF_SECURITY_ADMIN_PASSWORD" "length" 10 "providedValues" (list "admin.password") "context" $) }}
 {{- end }}