diff --git a/metadata/service/client/dashboards/core/system.yml b/metadata/service/client/dashboards/core/system.yml
index 3741f43..82b243a 100644
--- a/metadata/service/client/dashboards/core/system.yml
+++ b/metadata/service/client/dashboards/core/system.yml
@@ -2,15 +2,15 @@ parameters:
   grafana:
     client:
       dashboard:
-        system_disk_prometheus:
+        linux_disk_prometheus:
           datasource: prometheus
           format: json
           template: grafana/files/dashboards/linux/system_disk_prometheus.json
-        system_network_prometheus:
+        linux_network_prometheus:
           datasource: prometheus
           format: json
           template: grafana/files/dashboards/linux/system_network_prometheus.json
-        system_overview_prometheus:
+        linux_overview_prometheus:
           datasource: prometheus
           format: json
           template: grafana/files/dashboards/linux/system_overview_prometheus.json
diff --git a/metadata/service/client/dashboards/openstack/neutron.yml b/metadata/service/client/dashboards/openstack/neutron.yml
index 3a6200e..c13fd9a 100644
--- a/metadata/service/client/dashboards/openstack/neutron.yml
+++ b/metadata/service/client/dashboards/openstack/neutron.yml
@@ -5,4 +5,4 @@ parameters:
         neutron_prometheus:
           datasource: prometheus
           format: json
-          template: grafana/files/dashboards/neutron/neutron_prometheus_fluentd.json
+          template: grafana/files/dashboards/neutron/neutron_prometheus.json
diff --git a/metadata/service/client/dashboards/stacklight/prometheus.yml b/metadata/service/client/dashboards/stacklight/prometheus.yml
index 027d56c..50c70ae 100644
--- a/metadata/service/client/dashboards/stacklight/prometheus.yml
+++ b/metadata/service/client/dashboards/stacklight/prometheus.yml
@@ -2,7 +2,7 @@ parameters:
   grafana:
     client:
       dashboard:
-        prometheus_performances_prometheus:
+        prometheus-performances_prometheus:
           datasource: prometheus
           format: json
           template: grafana/files/dashboards/prometheus/prometheus_performances_prometheus.json