diff --git a/charts/premium/blocky/Chart.yaml b/charts/premium/blocky/Chart.yaml
index 550edef8016..9e6ecebd63d 100644
--- a/charts/premium/blocky/Chart.yaml
+++ b/charts/premium/blocky/Chart.yaml
@@ -43,4 +43,4 @@ sources:
   - https://hub.docker.com/r/spx01/blocky
   - https://quay.io/oriedge/k8s_gateway
 type: application
-version: 16.13.8
+version: 16.13.9
diff --git a/charts/premium/blocky/values.yaml b/charts/premium/blocky/values.yaml
index 21330495440..29c311631d9 100644
--- a/charts/premium/blocky/values.yaml
+++ b/charts/premium/blocky/values.yaml
@@ -311,7 +311,7 @@ configmap:
   datasource:
     enabled: true
     labels:
-      grafana_datasources: "1"
+      grafana_datasource: "1"
     data:
       datasourceblockypsql.yaml: |-
         apiVersion: 1
diff --git a/charts/premium/grafana/values.yaml b/charts/premium/grafana/values.yaml
index ab0d5995cd9..418924a2a79 100644
--- a/charts/premium/grafana/values.yaml
+++ b/charts/premium/grafana/values.yaml
@@ -86,7 +86,7 @@ workload:
           env:
             IGNORE_ALREADY_PROCESSED: false
             METHOD: WATCH
-            LABEL: grafana_datasources
+            LABEL: grafana_datasource
             LABEL_VALUE: "1"
             LOG_LEVEL: info
             FOLDER: /etc/grafana/provisioning/datasources
diff --git a/charts/stable/bitmagnet/Chart.yaml b/charts/stable/bitmagnet/Chart.yaml
index 7efd796e46f..91660c43135 100644
--- a/charts/stable/bitmagnet/Chart.yaml
+++ b/charts/stable/bitmagnet/Chart.yaml
@@ -34,4 +34,4 @@ sources:
   - https://github.com/bitmagnet-io/bitmagnet
   - https://github.com/truecharts/charts/tree/master/charts/stable/bitmagnet
 type: application
-version: 3.7.0
+version: 3.7.1
diff --git a/charts/stable/bitmagnet/values.yaml b/charts/stable/bitmagnet/values.yaml
index 7edaf59607a..922d92bfa1c 100644
--- a/charts/stable/bitmagnet/values.yaml
+++ b/charts/stable/bitmagnet/values.yaml
@@ -86,7 +86,7 @@ configmap:
   datasource:
     enabled: true
     labels:
-      grafana_datasources: "1"
+      grafana_datasource: "1"
     data:
       bitmagnetpsql.yaml: |-
         apiVersion: 1
diff --git a/charts/stable/teslamate/Chart.yaml b/charts/stable/teslamate/Chart.yaml
index 5d7dd37a0d0..e81a17531d7 100644
--- a/charts/stable/teslamate/Chart.yaml
+++ b/charts/stable/teslamate/Chart.yaml
@@ -36,4 +36,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/teslamate
   - https://hub.docker.com/r/teslamate/teslamate
 type: application
-version: 3.0.0
+version: 3.0.1
diff --git a/charts/stable/teslamate/values.yaml b/charts/stable/teslamate/values.yaml
index fc7147d0e37..e35223eb06c 100644
--- a/charts/stable/teslamate/values.yaml
+++ b/charts/stable/teslamate/values.yaml
@@ -46,7 +46,7 @@ configmap:
   datasource:
     enabled: true
     labels:
-      grafana_datasources: "1"
+      grafana_datasource: "1"
     data:
       datasourceteslamatepsql.yaml: |-
         apiVersion: 1