diff --git a/monitoring/grafana-aether/templates/dashboard-configmap.yaml b/monitoring/grafana-aether/templates/dashboard-configmap.yaml
index a9e6d98..65438ce 100644
--- a/monitoring/grafana-aether/templates/dashboard-configmap.yaml
+++ b/monitoring/grafana-aether/templates/dashboard-configmap.yaml
@@ -8,24 +8,7 @@
   labels:
      grafana_dashboard: "1"
 data:
-{{- if .Values.globalDashboard }}
-{{- if and .Values.edgeServerDatasourceURL .Values.googleCloudMonitoring }}
-{{ (.Files.Glob "dashboards/global*.json").AsConfig | indent 2 }}
-{{- end }}
-{{- end }}
-{{- if .Values.multiSiteDashboard }}
-{{- if and .Values.edgeServerDatasourceURL .Values.clusterDatasources }}
-{{ (.Files.Glob "dashboards/multi*.json").AsConfig | indent 2 }}
-{{- end }}
-{{- end }}
-{{- if .Values.enterpriseDashboard }}
-{{- if and .Values.edgeServerDatasourceURL .Values.clusterDatasources }}
-{{- $path := printf "dashboards/%s*.json" .Values.enterpriseDashboard }}
-{{ (.Files.Glob $path).AsConfig | indent 2 }}
-{{- end }}
-{{- end }}
-{{- if .Values.sdCoreDashboard }}
-{{- if .Values.sdCoreDatasourceURL }}
-{{ (.Files.Glob "dashboards/sdcore*.json").AsConfig | indent 2 }}
-{{- end }}
-{{- end }}
\ No newline at end of file
+{{- range .Values.dashboards }}
+{{- $dashboard := printf "dashboards/%s" . }}
+{{ ($.Files.Glob $dashboard).AsConfig | indent 2 }}
+{{- end}}