diff --git a/charts/cluster-addons/templates/kube-prometheus-stack.yaml b/charts/cluster-addons/templates/kube-prometheus-stack.yaml
index 9283bce..4c2e9b0 100644
--- a/charts/cluster-addons/templates/kube-prometheus-stack.yaml
+++ b/charts/cluster-addons/templates/kube-prometheus-stack.yaml
@@ -2,6 +2,24 @@
 {{- include "cluster-addons.job.defaults" (list . "kube-prometheus-stack") }}
 installType: helm
 helm: {{ toYaml .Values.monitoring.kubePrometheusStack | nindent 2 }}
+extraFiles:
+  configmap-nvidia-dcgm-exporter-dashboard.yaml: |
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: nvidia-dcgm-exporter-dashboard
+      namespace: {{ .Values.monitoring.kubePrometheusStack.release.namespace }}
+      labels:
+        {{- include "cluster-addons.labels" . | nindent 8 }}
+        grafana_dashboard: "1"
+    data:
+      nvidia-dcgm-exporter-dashboard.json: |
+        {{- .Files.Get "grafana-dashboards/nvidia-dcgm-exporter-dashboard_rev2.json" | nindent 8 }}
+hooks:
+  postInstall: |
+    kubectl apply -f ./configmap-nvidia-dcgm-exporter-dashboard.yaml
+  preDelete: |
+    kubectl delete -f ./configmap-nvidia-dcgm-exporter-dashboard.yaml
 {{- end }}
 
 {{-
diff --git a/charts/cluster-addons/templates/nvidia-gpu-operator.yaml b/charts/cluster-addons/templates/nvidia-gpu-operator.yaml
index bb2da81..5c9e0a8 100644
--- a/charts/cluster-addons/templates/nvidia-gpu-operator.yaml
+++ b/charts/cluster-addons/templates/nvidia-gpu-operator.yaml
@@ -3,25 +3,6 @@
 installType: helm
 helm: {{ omit .Values.nvidiaGPUOperator "enabled" | toYaml | nindent 2 }}
 {{- end }}
-extraFiles:
-  configmap-nvidia-dcgm-exporter-dashboard.yaml: |
-    apiVersion: v1
-    kind: ConfigMap
-    metadata:
-      name: nvidia-dcgm-exporter-dashboard
-      namespace: {{ .Values.monitoring.kubePrometheusStack.release.namespace }}
-      labels:
-        {{- include "cluster-addons.labels" . | nindent 8 }}
-        grafana_dashboard: "1"
-    data:
-      nvidia-dcgm-exporter-dashboard.json: |
-        {{- .Files.Get "grafana-dashboards/nvidia-dcgm-exporter-dashboard_rev2.json" | nindent 8 }}
-hooks:
-  postInstall: |
-    kubectl apply -f ./configmap-nvidia-dcgm-exporter-dashboard.yaml
-  preDelete: |
-    kubectl delete -f ./configmap-nvidia-dcgm-exporter-dashboard.yaml
-{{- end }}
 
 {{-
   include "addon.job" (list