diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/dashboard.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/dashboard.yaml
index f75eabc3..098cf423 100644
--- a/freeleaps/helm-pkg/authentication/templates/authentication/dashboard.yaml
+++ b/freeleaps/helm-pkg/authentication/templates/authentication/dashboard.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     grafana_dashboard: "1"
 data:
-  dashboard.json: |
+  {{ .Values.dashboard.name }}.json: |
     {
       "annotations": {
         "list": [
diff --git a/freeleaps/helm-pkg/centralStorage/templates/central-storage/dashboard.yaml b/freeleaps/helm-pkg/centralStorage/templates/central-storage/dashboard.yaml
index f75eabc3..098cf423 100644
--- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/dashboard.yaml
+++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/dashboard.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     grafana_dashboard: "1"
 data:
-  dashboard.json: |
+  {{ .Values.dashboard.name }}.json: |
     {
       "annotations": {
         "list": [
diff --git a/freeleaps/helm-pkg/content/templates/content/dashboard.yaml b/freeleaps/helm-pkg/content/templates/content/dashboard.yaml
index f75eabc3..098cf423 100644
--- a/freeleaps/helm-pkg/content/templates/content/dashboard.yaml
+++ b/freeleaps/helm-pkg/content/templates/content/dashboard.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     grafana_dashboard: "1"
 data:
-  dashboard.json: |
+  {{ .Values.dashboard.name }}.json: |
     {
       "annotations": {
         "list": [
diff --git a/freeleaps/helm-pkg/notification/templates/notification/dashboard.yaml b/freeleaps/helm-pkg/notification/templates/notification/dashboard.yaml
index f75eabc3..098cf423 100644
--- a/freeleaps/helm-pkg/notification/templates/notification/dashboard.yaml
+++ b/freeleaps/helm-pkg/notification/templates/notification/dashboard.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     grafana_dashboard: "1"
 data:
-  dashboard.json: |
+  {{ .Values.dashboard.name }}.json: |
     {
       "annotations": {
         "list": [
diff --git a/freeleaps/helm-pkg/payment/templates/payment/dashboard.yaml b/freeleaps/helm-pkg/payment/templates/payment/dashboard.yaml
index f75eabc3..098cf423 100644
--- a/freeleaps/helm-pkg/payment/templates/payment/dashboard.yaml
+++ b/freeleaps/helm-pkg/payment/templates/payment/dashboard.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     grafana_dashboard: "1"
 data:
-  dashboard.json: |
+  {{ .Values.dashboard.name }}.json: |
     {
       "annotations": {
         "list": [