diff --git a/monitoring/grafana-aether/templates/dashboard-configmap.yaml b/monitoring/grafana-aether/templates/dashboard-configmap.yaml
index a9e6d98..cc0dfa2 100644
--- a/monitoring/grafana-aether/templates/dashboard-configmap.yaml
+++ b/monitoring/grafana-aether/templates/dashboard-configmap.yaml
@@ -5,6 +5,9 @@
 kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-dashboards
+{{- if .Values.dashboardNamespace }}
+  namespace: {{ .Values.dashboardNamespace }}
+{{- end }}
   labels:
      grafana_dashboard: "1"
 data:
diff --git a/monitoring/grafana-aether/templates/datasource-configmap.yaml b/monitoring/grafana-aether/templates/datasource-configmap.yaml
index 81034e2..0de48da 100644
--- a/monitoring/grafana-aether/templates/datasource-configmap.yaml
+++ b/monitoring/grafana-aether/templates/datasource-configmap.yaml
@@ -5,6 +5,9 @@
 kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-datasource
+{{- if .Values.datasourceNamespace }}
+  namespace: {{ .Values.datasourceNamespace }}
+{{- end }}
   labels:
      grafana_datasource: "1"
 data: