diff --git a/chart/operator/templates/grafana-k8sgpt-dashboard.yaml b/chart/operator/templates/grafana-k8sgpt-dashboard.yaml
index 317678b7..1580301d 100644
--- a/chart/operator/templates/grafana-k8sgpt-dashboard.yaml
+++ b/chart/operator/templates/grafana-k8sgpt-dashboard.yaml
@@ -1,9 +1,11 @@
-{{ if .Values.grafanaDashboard -}}
+{{ if .Values.grafanaDashboard.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
+  annotations:
+    {{ .Values.grafanaDashboard.folder.annotation }}: {{ .Values.grafanaDashboard.folder.name }}
   labels:
-    grafana_dashboard: "1"
+    {{ .Values.grafanaDashboard.label.key }}: {{ .Values.grafanaDashboard.label.value | quote }}
     app.kubernetes.io/component: configmap
     app.kubernetes.io/created-by: k8sgpt-operator
     app.kubernetes.io/part-of: k8sgpt-operator
diff --git a/chart/operator/values.yaml b/chart/operator/values.yaml
index 6fe4b29b..d5b4da86 100644
--- a/chart/operator/values.yaml
+++ b/chart/operator/values.yaml
@@ -1,7 +1,14 @@
 serviceMonitor:
   enabled: false
   additionalLabels: {}
-grafanaDashboard: false
+grafanaDashboard:
+  enabled: false
+  folder:
+    annotation: grafana_folder
+    name: ai
+  label:
+    key: grafana_dashboard
+    value: "1"
 controllerManager:
   kubeRbacProxy:
     containerSecurityContext: