diff --git a/charts/premium/grafana/Chart.yaml b/charts/premium/grafana/Chart.yaml
index 9a61432e885..7069ddb91ab 100644
--- a/charts/premium/grafana/Chart.yaml
+++ b/charts/premium/grafana/Chart.yaml
@@ -37,4 +37,4 @@ sources:
   - https://hub.docker.com/r/grafana/grafana
   - https://quay.io/kiwigrid/k8s-sidecar
 type: application
-version: 17.16.0
+version: 17.16.1
diff --git a/charts/premium/grafana/ci/all-dashboards.yaml b/charts/premium/grafana/ci/all-dashboards.yaml
index 7f02274ae4d..fe9b646274f 100644
--- a/charts/premium/grafana/ci/all-dashboards.yaml
+++ b/charts/premium/grafana/ci/all-dashboards.yaml
@@ -1,8 +1,8 @@
 configmap:
   # Some included dashboards, which can be enabled when prefered
-  dashboard_certmanager:
+  dashboard-certmanager:
     enabled: true
-  dashboard_traefik:
+  dashboard-traefik:
     enabled: true
-  dashboard_nginx:
+  dashboard-nginx:
     enabled: true