diff --git a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/configuration/grafana-dashboard.xml b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/configuration/grafana-dashboard.xml
index 96c7a56d..11f17a4b 100644
--- a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/configuration/grafana-dashboard.xml
+++ b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/configuration/grafana-dashboard.xml
@@ -26,15 +26,14 @@
 apiVersion: 1
 
 providers:
-<#if prometheus_url??>
-<#list db as dashboards>
+<#list dashboards as db>
   - name: '${db.name}'
     orgId: 1
     folder: '${db.folder}'
     type: file
     options:
       path: '${db.path}'
-</#if>
+</#list>
 ]]>
         </value>
         <attrs>
diff --git a/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaParams.java b/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaParams.java
index ba5a067b..9a881ed2 100644
--- a/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaParams.java
+++ b/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaParams.java
@@ -92,7 +92,7 @@ public String dashboardConfigDir(String cluster) {
 
     /// TODO
     public List<String> getClusters() {
-        return List.of("ALL");
+        return List.of("cluster_name");
     }
 
     @GlobalParams