diff --git a/manifests/grafana.yaml b/manifests/grafana.yaml
index 6f23b95..320a172 100644
--- a/manifests/grafana.yaml
+++ b/manifests/grafana.yaml
@@ -7,81 +7,62 @@ spec:
   project: default
   source:
     chart: grafana
-    repoURL: https://charts.bitnami.com/bitnami
-    targetRevision: 12.1.7
+    repoURL: https://grafana.github.io/helm-charts
+    targetRevision: 8.7.2
     helm:
       releaseName: grafana
       values: |
-        grafana:
-          containerSecurityContext:
-            runAsUser: 1000
-          podSecurityContext:
-            enabled: false
-            runAsNonRoot: true
-            fsGroup: 1000
-            runAsUser: 1000
         persistence:
           enabled: true
+          type: pvc
           existingClaim: grafana-local-pvc
-        volumePermissions:
+          storageClassName: null
+          accessModes:
+            - ReadWriteOnce
+
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+          fsGroup: 1000
+          runAsNonRoot: true
+
+        initChownData:
           enabled: true
-          containerSecurityContext:
+          securityContext:
+            runAsNonRoot: false
             runAsUser: 0
-        dashboardsProvider:
-          enabled: true
+            seccompProfile:
+              type: RuntimeDefault
+            capabilities:
+              add:
+                - CHOWN
+              drop:
+                - ALL
+
+        resources:
+          limits:
+            cpu: 500m
+            memory: 1Gi
+          requests:
+            cpu: 200m
+            memory: 256Mi
+
+        # Load existing dashboards from ConfigMaps
         dashboardsConfigMaps:
-          - configMapName: prometheus-kube-prometheus-alertmanager-overview
-            fileName: alertmanager-overview.json
-          - configMapName: prometheus-kube-prometheus-apiserver
-            fileName: apiserver.json
-          - configMapName: prometheus-kube-prometheus-cluster-total
-            fileName: cluster-total.json
-          - configMapName: prometheus-kube-prometheus-controller-manager
-            fileName: controller-manager.json
-          - configMapName: prometheus-kube-prometheus-etcd
-            fileName: etcd.json
-          - configMapName: prometheus-kube-prometheus-grafana-overview
-            fileName: grafana-overview.json
-          - configMapName: prometheus-kube-prometheus-k8s-coredns
-            fileName: k8s-coredns.json
-          - configMapName: prometheus-kube-prometheus-k8s-resources-cluster
-            fileName: k8s-resources-cluster.json
-          - configMapName: prometheus-kube-prometheus-k8s-resources-namespace
-            fileName: k8s-resources-namespace.json
-          - configMapName: prometheus-kube-prometheus-k8s-resources-node
-            fileName: k8s-resources-node.json
-          - configMapName: prometheus-kube-prometheus-k8s-resources-pod
-            fileName: k8s-resources-pod.json
-          - configMapName: prometheus-kube-prometheus-k8s-resources-workload
-            fileName: k8s-resources-workload.json
-          - configMapName: prometheus-kube-prometheus-k8s-resources-workloads-namespace
-            fileName: k8s-resources-workloads-namespace.json
-          - configMapName: prometheus-kube-prometheus-kubelet
-            fileName: kubelet.json
-          - configMapName: prometheus-kube-prometheus-namespace-by-pod
-            fileName: namespace-by-pod.json
-          - configMapName: prometheus-kube-prometheus-namespace-by-workload
-            fileName: namespace-by-workload.json
-          - configMapName: prometheus-kube-prometheus-node-cluster-rsrc-use
-            fileName: node-cluster-rsrc-use.json
-          - configMapName: prometheus-kube-prometheus-node-rsrc-use
-            fileName: node-rsrc-use.json
-          - configMapName: prometheus-kube-prometheus-nodes-darwin
-            fileName: nodes-darwin.json
-          - configMapName: prometheus-kube-prometheus-nodes
-            fileName: nodes.json
-          - configMapName: prometheus-kube-prometheus-persistentvolumesusage
-            fileName: persistentvolumesusage.json
-          - configMapName: prometheus-kube-prometheus-pod-total
-            fileName: pod-total.json
-          - configMapName: prometheus-kube-prometheus-prometheus
-            fileName: prometheus.json
-          - configMapName: prometheus-kube-prometheus-proxy
-            fileName: proxy.json
-          - configMapName: prometheus-kube-prometheus-scheduler
-            fileName: scheduler.json
-          - configMapName: prometheus-kube-prometheus-workload-total
-            fileName: workload-total.json
+          prometheus: "prometheus-kube-prometheus-alertmanager-overview,prometheus-kube-prometheus-apiserver,prometheus-kube-prometheus-cluster-total,prometheus-kube-prometheus-controller-manager,prometheus-kube-prometheus-etcd,prometheus-kube-prometheus-grafana-overview,prometheus-kube-prometheus-k8s-coredns,prometheus-kube-prometheus-k8s-resources-cluster,prometheus-kube-prometheus-k8s-resources-namespace,prometheus-kube-prometheus-k8s-resources-node,prometheus-kube-prometheus-k8s-resources-pod,prometheus-kube-prometheus-k8s-resources-workload,prometheus-kube-prometheus-k8s-resources-workloads-namespace,prometheus-kube-prometheus-kubelet,prometheus-kube-prometheus-namespace-by-pod,prometheus-kube-prometheus-namespace-by-workload,prometheus-kube-prometheus-node-cluster-rsrc-use,prometheus-kube-prometheus-node-rsrc-use,prometheus-kube-prometheus-nodes-darwin,prometheus-kube-prometheus-nodes,prometheus-kube-prometheus-persistentvolumesusage,prometheus-kube-prometheus-pod-total,prometheus-kube-prometheus-prometheus,prometheus-kube-prometheus-proxy,prometheus-kube-prometheus-scheduler,prometheus-kube-prometheus-workload-total"
+
+        dashboardProviders:
+          dashboardproviders.yaml:
+            apiVersion: 1
+            providers:
+            - name: 'prometheus'
+              orgId: 1
+              folder: 'Prometheus'
+              type: file
+              disableDeletion: false
+              editable: true
+              options:
+                path: /var/lib/grafana/dashboards/prometheus
   destination:
     server: https://kubernetes.default.svc
     namespace: default