diff --git a/class/defaults.yml b/class/defaults.yml
index aaf4243..3da7b93 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -11,7 +11,7 @@ parameters:
     secrets: {}
 
     charts:
-      grafana: 6.57.2
+      grafana: 7.3.12
     dashboards: {}
     datasources: {}
     extraConfigMap: {}
diff --git a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/clusterrole.yaml b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/clusterrole.yaml
index 58795b1..6b6f3c0 100644
--- a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/clusterrole.yaml
+++ b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/instance: grafana-helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 9.5.3
-    helm.sh/chart: grafana-6.57.2
+    app.kubernetes.io/version: 10.4.3
+    helm.sh/chart: grafana-7.3.12
   name: grafana-helm-clusterrole
 rules: []
diff --git a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/clusterrolebinding.yaml b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/clusterrolebinding.yaml
index 1cd273f..684ef65 100644
--- a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/clusterrolebinding.yaml
+++ b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/clusterrolebinding.yaml
@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/instance: grafana-helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 9.5.3
-    helm.sh/chart: grafana-6.57.2
+    app.kubernetes.io/version: 10.4.3
+    helm.sh/chart: grafana-7.3.12
   name: grafana-helm-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/configmap.yaml b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/configmap.yaml
index b188b54..1d321a9 100644
--- a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/configmap.yaml
+++ b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/configmap.yaml
@@ -20,7 +20,7 @@ metadata:
     app.kubernetes.io/instance: grafana-helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 9.5.3
-    helm.sh/chart: grafana-6.57.2
+    app.kubernetes.io/version: 10.4.3
+    helm.sh/chart: grafana-7.3.12
   name: grafana-helm
   namespace: syn-grafana
diff --git a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/deployment.yaml b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/deployment.yaml
index 28bf92d..b32d7ec 100644
--- a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/deployment.yaml
+++ b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/deployment.yaml
@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/instance: grafana-helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 9.5.3
-    helm.sh/chart: grafana-6.57.2
+    app.kubernetes.io/version: 10.4.3
+    helm.sh/chart: grafana-7.3.12
   name: grafana-helm
   namespace: syn-grafana
 spec:
@@ -21,9 +21,8 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 3cf37536fecf70a21e9a58c1a854a5329a0a08859327542211dae5ae2f651043
-        checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
-        checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
+        checksum/config: 0e9cbd0ea8e24e32f7dfca5bab17a2ba05652642f0a09a4882833ae88e4cc4a3
+        checksum/sc-dashboard-provider-config: 593c0a8778b83f11fe80ccb21dfb20bc46705e2be3178df1dc4c89d164c8cd9c
         kubectl.kubernetes.io/default-container: grafana
       labels:
         app.kubernetes.io/instance: grafana-helm
@@ -54,7 +53,7 @@ spec:
               value: /var/lib/grafana/plugins
             - name: GF_PATHS_PROVISIONING
               value: /etc/grafana/provisioning
-          image: docker.io/grafana/grafana:9.5.3
+          image: docker.io/grafana/grafana:10.4.3
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 10
diff --git a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/role.yaml b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/role.yaml
index 9eee89f..aa761a9 100644
--- a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/role.yaml
+++ b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/role.yaml
@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/instance: grafana-helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 9.5.3
-    helm.sh/chart: grafana-6.57.2
+    app.kubernetes.io/version: 10.4.3
+    helm.sh/chart: grafana-7.3.12
   name: grafana-helm
   namespace: syn-grafana
 rules: []
diff --git a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/rolebinding.yaml b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/rolebinding.yaml
index c1638bc..725a07a 100644
--- a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/rolebinding.yaml
+++ b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/rolebinding.yaml
@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/instance: grafana-helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 9.5.3
-    helm.sh/chart: grafana-6.57.2
+    app.kubernetes.io/version: 10.4.3
+    helm.sh/chart: grafana-7.3.12
   name: grafana-helm
   namespace: syn-grafana
 roleRef:
diff --git a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/service.yaml b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/service.yaml
index 9b2c7eb..4e4c508 100644
--- a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/service.yaml
+++ b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/service.yaml
@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/instance: grafana-helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 9.5.3
-    helm.sh/chart: grafana-6.57.2
+    app.kubernetes.io/version: 10.4.3
+    helm.sh/chart: grafana-7.3.12
   name: grafana-helm
   namespace: syn-grafana
 spec:
diff --git a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/serviceaccount.yaml b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/serviceaccount.yaml
index d8a48ca..56397e6 100644
--- a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/serviceaccount.yaml
+++ b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/serviceaccount.yaml
@@ -1,11 +1,12 @@
 apiVersion: v1
+automountServiceAccountToken: false
 kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/instance: grafana-helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 9.5.3
-    helm.sh/chart: grafana-6.57.2
+    app.kubernetes.io/version: 10.4.3
+    helm.sh/chart: grafana-7.3.12
   name: grafana-helm
   namespace: syn-grafana
diff --git a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/servicemonitor.yaml b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/servicemonitor.yaml
index 5077bd6..8cd3fb7 100644
--- a/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/servicemonitor.yaml
+++ b/tests/golden/defaults/grafana-helm/grafana-helm/01_helmchart/grafana/templates/servicemonitor.yaml
@@ -5,14 +5,14 @@ metadata:
     app.kubernetes.io/instance: grafana-helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 9.5.3
-    helm.sh/chart: grafana-6.57.2
+    app.kubernetes.io/version: 10.4.3
+    helm.sh/chart: grafana-7.3.12
   name: grafana-helm
   namespace: syn-grafana
 spec:
   endpoints:
     - honorLabels: true
-      interval: 1m
+      interval: 30s
       path: /metrics
       port: service
       scheme: http