diff --git a/bitnami/grafana/CHANGELOG.md b/bitnami/grafana/CHANGELOG.md
index 5421105f59..cd955ba402 100644
--- a/bitnami/grafana/CHANGELOG.md
+++ b/bitnami/grafana/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 12.0.1 (2025-05-14)
+## 12.0.2 (2025-05-15)
 
-* [bitnami/grafana] Grafana uniq dashboard volumes ([#33689](https://github.com/bitnami/charts/pull/33689))
+* [bitnami/grafana] fix metrics namespace include ([#33714](https://github.com/bitnami/charts/pull/33714))
+
+## <small>12.0.1 (2025-05-15)</small>
+
+* [bitnami/grafana] Grafana uniq dashboard volumes (#33689) ([e7e3012](https://github.com/bitnami/charts/commit/e7e3012f25807031502221ec6d83d00d1100d597)), closes [#33689](https://github.com/bitnami/charts/issues/33689)
 
 ## 12.0.0 (2025-05-12)
 
diff --git a/bitnami/grafana/Chart.yaml b/bitnami/grafana/Chart.yaml
index c985c1ab3d..d65ed4630a 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.1
+version: 12.0.2
diff --git a/bitnami/grafana/templates/prometheusrules.yaml b/bitnami/grafana/templates/prometheusrules.yaml
index 9c5962793e..a63de60610 100644
--- a/bitnami/grafana/templates/prometheusrules.yaml
+++ b/bitnami/grafana/templates/prometheusrules.yaml
@@ -8,7 +8,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ include "common.names.fullname" . }}
-  namespace: {{ default include "common.names.namespace" .Values.metrics.prometheusRule.namespace | quote }}
+  namespace: {{ default (include "common.names.namespace" .) .Values.metrics.prometheusRule.namespace | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/component: metrics
     {{- if .Values.metrics.prometheusRule.additionalLabels }}
diff --git a/bitnami/grafana/templates/servicemonitor.yaml b/bitnami/grafana/templates/servicemonitor.yaml
index 865954fb6f..742d735c99 100644
--- a/bitnami/grafana/templates/servicemonitor.yaml
+++ b/bitnami/grafana/templates/servicemonitor.yaml
@@ -8,7 +8,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "common.names.fullname" . }}
-  namespace: {{ default include "common.names.namespace" .Values.metrics.serviceMonitor.namespace | quote }}
+  namespace: {{ default (include "common.names.namespace" .) .Values.metrics.serviceMonitor.namespace | quote }}
   {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
     {{- if .Values.metrics.serviceMonitor.additionalLabels }}