diff --git a/charts/monitoring/Chart.yaml b/charts/monitoring/Chart.yaml
index c36c452..6526493 100644
--- a/charts/monitoring/Chart.yaml
+++ b/charts/monitoring/Chart.yaml
@@ -8,4 +8,4 @@ dependencies:
 description: A Helm chart for Monitoring
 name: monitoring
 type: application
-version: 0.1.16
+version: 0.1.17
diff --git a/charts/monitoring/templates/alertmanager-dashboard.yaml b/charts/monitoring/templates/alertmanager-dashboard.yaml
index 7060429..2392d2f 100644
--- a/charts/monitoring/templates/alertmanager-dashboard.yaml
+++ b/charts/monitoring/templates/alertmanager-dashboard.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "monitoring.fullname" . }}-alert-manager
   annotations:
     meta.helm.sh/release-namespace: {{ .Release.Namespace }}
-    grafana_folder: "Alert Manager"
+    grafana_folder: "Alert-Manager"
   labels:
     grafana_dashboard: "1"
 data:
diff --git a/charts/monitoring/templates/proact-dashboard.yaml b/charts/monitoring/templates/proact-dashboard.yaml
index 4def99a..ad952d6 100644
--- a/charts/monitoring/templates/proact-dashboard.yaml
+++ b/charts/monitoring/templates/proact-dashboard.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "monitoring.fullname" . }}-Proact-Dashboard
+  name: {{ include "monitoring.fullname" . }}-proact
   annotations:
     meta.helm.sh/release-namespace: {{ .Release.Namespace }}
     grafana_folder: "Proact"
diff --git a/charts/monitoring/templates/prometheus-alertmanager-datasource.yaml b/charts/monitoring/templates/prometheus-alertmanager-datasource.yaml
index 18311c9..da0fb87 100644
--- a/charts/monitoring/templates/prometheus-alertmanager-datasource.yaml
+++ b/charts/monitoring/templates/prometheus-alertmanager-datasource.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "monitoring.fullname" . }}-prometheus-alertManager 
+  name: {{ include "monitoring.fullname" . }}-prometheus-alertmanager 
   annotations:
     meta.helm.sh/release-namespace: {{ .Release.Namespace }}
   labels: