diff --git a/grafana/files/dashboards/neutron/neutron_openvswitch_prometheus.json b/grafana/files/dashboards/neutron/neutron_openvswitch_prometheus.json
index 27f3a40..9d0a5b4 100644
--- a/grafana/files/dashboards/neutron/neutron_openvswitch_prometheus.json
+++ b/grafana/files/dashboards/neutron/neutron_openvswitch_prometheus.json
@@ -664,7 +664,7 @@
       "targets": [
         {
           "$$hashKey": "object:2247",
-          "expr": "sum(rate(openstack_http_response_times_count{environment=\"$environment\", service=\"neutron\",host=~\"$host\"}[$rate_interval])) by (http_status)",
+          "expr": "sum(rate(openstack_http_response_times_count{environment=\"$environment\", service=\"neutron-server\",host=~\"$host\"}[$rate_interval])) by (http_status)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -757,7 +757,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(openstack_http_response_times{environment=\"$environment\", service=\"neutron\",quantile=\"0.9\",host=~\"^$host$\",http_status=~\"2..\"}) by (http_method)",
+          "expr": "avg(openstack_http_response_times{environment=\"$environment\", service=\"neutron-server\",quantile=\"0.9\",host=~\"^$host$\",http_status=~\"2..\"}) by (http_method)",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{http_method}}",
@@ -1842,7 +1842,7 @@
         "multi": true,
         "name": "host",
         "options": [],
-        "query": "label_values(openstack_http_response_times{environment=\"$environment\", service=\"neutron\"}, host)",
+        "query": "label_values(openstack_http_response_times{environment=\"$environment\", service=\"neutron-server\"}, host)",
         "refresh": 1,
         "regex": "",
         "sort": 1,
@@ -1928,6 +1928,6 @@
   "timezone": "",
   "title": "Neutron",
   "uid": null,
-  "version": 1
+  "version": 2
 }
 {%- endraw %}
diff --git a/grafana/files/dashboards/neutron/neutron_prometheus.json b/grafana/files/dashboards/neutron/neutron_prometheus.json
index e6c2427..5599782 100644
--- a/grafana/files/dashboards/neutron/neutron_prometheus.json
+++ b/grafana/files/dashboards/neutron/neutron_prometheus.json
@@ -679,7 +679,7 @@
       "targets": [
         {
           "$$hashKey": "object:28939",
-          "expr": "sum(rate(openstack_http_response_times_count{environment=\"$environment\", service=\"neutron\",host=~\"$host\"}[$rate_interval])) by (http_status)",
+          "expr": "sum(rate(openstack_http_response_times_count{environment=\"$environment\", service=\"neutron-server\",host=~\"$host\"}[$rate_interval])) by (http_status)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -772,7 +772,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(openstack_http_response_times{environment=\"$environment\", service=\"neutron\",quantile=\"0.9\",host=~\"^$host$\",http_status=~\"2..\"}) by (http_method)",
+          "expr": "avg(openstack_http_response_times{environment=\"$environment\", service=\"neutron-server\",quantile=\"0.9\",host=~\"^$host$\",http_status=~\"2..\"}) by (http_method)",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{http_method}}",
@@ -1399,7 +1399,7 @@
         "multi": true,
         "name": "host",
         "options": [],
-        "query": "label_values(openstack_http_response_times{environment=\"$environment\", service=\"neutron\"}, host)",
+        "query": "label_values(openstack_http_response_times{environment=\"$environment\", service=\"neutron-server\"}, host)",
         "refresh": 1,
         "regex": "",
         "sort": 1,
@@ -1485,6 +1485,6 @@
   "timezone": "",
   "title": "Neutron",
   "uid": null,
-  "version": 1
+  "version": 2
 }
 {%- endraw %}