diff --git a/grafana/files/dashboards/Cinder.json b/grafana/files/dashboards/Cinder.json
index 86b139a..34ae2f7 100644
--- a/grafana/files/dashboards/Cinder.json
+++ b/grafana/files/dashboards/Cinder.json
@@ -5107,7 +5107,7 @@
         "includeAll": true,
         "name": "server",
         "options": [],
-        "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label =~ /^$environment$/",
+        "query": "show tag values from openstack_cinder_http_response_times with key = hostname where environment_label =~ /^$environment$/",
         "refresh": 1,
         "refresh_on_load": true,
         "regex": "",
diff --git a/grafana/files/dashboards/Glance.json b/grafana/files/dashboards/Glance.json
index 7f658a8..6a62e1d 100644
--- a/grafana/files/dashboards/Glance.json
+++ b/grafana/files/dashboards/Glance.json
@@ -3218,7 +3218,7 @@
         "includeAll": true,
         "name": "server",
         "options": [],
-        "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label =~ /^$environment$/ ",
+        "query": "show tag values from openstack_glance_http_response_times with key = hostname where environment_label =~ /^$environment$/ ",
         "refresh": 1,
         "refresh_on_load": true,
         "regex": "",
diff --git a/grafana/files/dashboards/HAProxy.json b/grafana/files/dashboards/HAProxy.json
index 8f6adc9..6d80660 100644
--- a/grafana/files/dashboards/HAProxy.json
+++ b/grafana/files/dashboards/HAProxy.json
@@ -2947,7 +2947,7 @@
         "includeAll": false,
         "name": "server",
         "options": [],
-        "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label =~ /^$environment$/ ",
+        "query": "show tag values from haproxy_backend_servers with key = hostname where environment_label =~ /^$environment$/ ",
         "refresh": 1,
         "refresh_on_load": true,
         "regex": "",
diff --git a/grafana/files/dashboards/Heat.json b/grafana/files/dashboards/Heat.json
index 6ef8a49..4cb60c9 100644
--- a/grafana/files/dashboards/Heat.json
+++ b/grafana/files/dashboards/Heat.json
@@ -1534,7 +1534,7 @@
         "includeAll": true,
         "name": "server",
         "options": [],
-        "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label =~ /^$environment$/",
+        "query": "show tag values from openstack_heat_http_response_times with key = hostname where environment_label =~ /^$environment$/",
         "refresh": 1,
         "refresh_on_load": true,
         "regex": "",
diff --git a/grafana/files/dashboards/Keystone.json b/grafana/files/dashboards/Keystone.json
index a7d6501..e047354 100644
--- a/grafana/files/dashboards/Keystone.json
+++ b/grafana/files/dashboards/Keystone.json
@@ -1970,7 +1970,7 @@
         "includeAll": true,
         "name": "server",
         "options": [],
-        "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label =~ /^$environment$/",
+        "query": "show tag values from openstack_keystone_http_response_times with key = hostname where environment_label =~ /^$environment$/",
         "refresh": 1,
         "refresh_on_load": true,
         "regex": "",
diff --git a/grafana/files/dashboards/Neutron.json b/grafana/files/dashboards/Neutron.json
index da28d3e..8bd139f 100644
--- a/grafana/files/dashboards/Neutron.json
+++ b/grafana/files/dashboards/Neutron.json
@@ -4330,7 +4330,7 @@
         "includeAll": true,
         "name": "server",
         "options": [],
-        "query": " show tag values from pacemaker_local_resource_active with key = hostname where environment_label =~ /^$environment$/ ",
+        "query": " show tag values from openstack_neutron_http_response_times with key = hostname where environment_label =~ /^$environment$/ ",
         "refresh": 1,
         "refresh_on_load": true,
         "regex": "",
diff --git a/grafana/files/dashboards/Nova.json b/grafana/files/dashboards/Nova.json
index 708200d..5f9befd 100644
--- a/grafana/files/dashboards/Nova.json
+++ b/grafana/files/dashboards/Nova.json
@@ -5495,7 +5495,7 @@
         "includeAll": true,
         "name": "server",
         "options": [],
-        "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label =~ /^$environment$/ ",
+        "query": "show tag values from openstack_nova_http_response_times with key = hostname where environment_label =~ /^$environment$/ ",
         "refresh": 1,
         "refresh_on_load": true,
         "regex": "",