diff --git a/charts/dependency/kube-state-metrics/Chart.yaml b/charts/dependency/kube-state-metrics/Chart.yaml
index e7e9f70b104..bef3dd4fadc 100644
--- a/charts/dependency/kube-state-metrics/Chart.yaml
+++ b/charts/dependency/kube-state-metrics/Chart.yaml
@@ -21,7 +21,7 @@ name: kube-state-metrics
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/dependency/kube-state-metrics
 type: application
-version: 1.0.36
+version: 1.0.37
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/dependency/kube-state-metrics/values.yaml b/charts/dependency/kube-state-metrics/values.yaml
index 3f4bb72c328..6a46b2bc07e 100644
--- a/charts/dependency/kube-state-metrics/values.yaml
+++ b/charts/dependency/kube-state-metrics/values.yaml
@@ -285,7 +285,7 @@ metrics:
     # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
     # @default -- See values.yaml
     enabled: true
-    type: serviceMonitor
+    type: "servicemonitor"
     endpoints:
       - port: main
       - port: selfmonitor
diff --git a/charts/dependency/node-exporter/Chart.yaml b/charts/dependency/node-exporter/Chart.yaml
index 95fc27ac992..1efd709a548 100644
--- a/charts/dependency/node-exporter/Chart.yaml
+++ b/charts/dependency/node-exporter/Chart.yaml
@@ -21,7 +21,7 @@ name: node-exporter
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/dependency/node-exporter
 type: application
-version: 1.0.40
+version: 1.0.41
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/dependency/node-exporter/values.yaml b/charts/dependency/node-exporter/values.yaml
index 875c93bca99..3343d961694 100644
--- a/charts/dependency/node-exporter/values.yaml
+++ b/charts/dependency/node-exporter/values.yaml
@@ -67,7 +67,7 @@ metrics:
     # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
     # @default -- See values.yaml
     enabled: true
-    type: serviceMonitor
+    type: "servicemonitor"
     endpoints:
       - port: main
         path: /metrics
diff --git a/charts/enterprise/grafana/Chart.yaml b/charts/enterprise/grafana/Chart.yaml
index 4f1f8190ec2..d765ec2eef8 100644
--- a/charts/enterprise/grafana/Chart.yaml
+++ b/charts/enterprise/grafana/Chart.yaml
@@ -24,7 +24,7 @@ sources:
   - https://github.com/bitnami/bitnami-docker-grafana
   - https://grafana.com/
 type: application
-version: 7.0.57
+version: 7.0.58
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/enterprise/grafana/values.yaml b/charts/enterprise/grafana/values.yaml
index d7b04a59234..bbea097215d 100644
--- a/charts/enterprise/grafana/values.yaml
+++ b/charts/enterprise/grafana/values.yaml
@@ -59,7 +59,7 @@ metrics:
     # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
     # @default -- See values.yaml
     enabled: true
-    type: serviceMonitor
+    type: "servicemonitor"
     endpoints:
       - port: main
         path: /metrics