diff --git a/grafana/create-nodepool.sh b/grafana/create-nodepool.sh
index 6e1fa38df7..fc42227519 100755
--- a/grafana/create-nodepool.sh
+++ b/grafana/create-nodepool.sh
@@ -20,12 +20,10 @@ function create {
 }
 
 create Rackspace 'rax-*' nodepool-rax.yaml
-create Inap 'inap-*' nodepool-inap.yaml
 create iWeb 'iweb-*' nodepool-iweb.yaml
 create Limestone 'limestone-*' nodepool-limestone.yaml
 create Linaro 'linaro-*' nodepool-linaro.yaml
 create OVH 'ovh-*' nodepool-ovh.yaml
 create Vexxhost 'vexxhost-*' nodepool-vexxhost.yaml
-create Airship-Citycloud 'airship-*' nodepool-airship-citycloud.yaml
 create OSUOSL 'osuosl-*' nodepool-osuosl.yaml
 create InMotion 'inmotion-*' nodepool-inmotion.yaml
diff --git a/grafana/nodepool-inmotion.yaml b/grafana/nodepool-inmotion.yaml
index 2a95e32e3e..a53d085e5f 100644
--- a/grafana/nodepool-inmotion.yaml
+++ b/grafana/nodepool-inmotion.yaml
@@ -148,7 +148,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.servers.*.mean, 4)
         - title: GET Server
           type: graph
           span: 4
@@ -160,7 +160,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.*.mean, 4)
         - title: DELETE Server
           type: graph
           span: 4
@@ -172,7 +172,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.*.mean, 4)
         - title: GET Servers Details
           type: graph
           lines: true
@@ -183,7 +183,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers_detail.*.mean, 4)
         - title: GET Limits
           type: graph
           lines: true
@@ -194,7 +194,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.*.mean, 4)
         - title: GET Flavors
           type: graph
           lines: true
@@ -205,7 +205,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors_detail.*.mean, 4)
         - title: GET network floatingips
           type: graph
           lines: true
@@ -216,7 +216,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.*.mean, 4)
         - title: GET networks
           type: graph
           lines: true
@@ -227,7 +227,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.*.mean, 4)
         - title: GET network ports
           type: graph
           lines: true
@@ -238,7 +238,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.*.mean, 4)
         - title: GET network subnets
           type: graph
           lines: true
@@ -249,4 +249,4 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.*.mean, 4)
diff --git a/grafana/nodepool-iweb.yaml b/grafana/nodepool-iweb.yaml
index f33c15331a..1a8bc42177 100644
--- a/grafana/nodepool-iweb.yaml
+++ b/grafana/nodepool-iweb.yaml
@@ -148,7 +148,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.servers.*.mean, 4)
         - title: GET Server
           type: graph
           span: 4
@@ -160,7 +160,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.*.mean, 4)
         - title: DELETE Server
           type: graph
           span: 4
@@ -172,7 +172,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.*.mean, 4)
         - title: GET Servers Details
           type: graph
           lines: true
@@ -183,7 +183,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers_detail.*.mean, 4)
         - title: GET Limits
           type: graph
           lines: true
@@ -194,7 +194,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.*.mean, 4)
         - title: GET Flavors
           type: graph
           lines: true
@@ -205,7 +205,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors_detail.*.mean, 4)
         - title: GET network floatingips
           type: graph
           lines: true
@@ -216,7 +216,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.*.mean, 4)
         - title: GET networks
           type: graph
           lines: true
@@ -227,7 +227,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.*.mean, 4)
         - title: GET network ports
           type: graph
           lines: true
@@ -238,7 +238,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.*.mean, 4)
         - title: GET network subnets
           type: graph
           lines: true
@@ -249,4 +249,4 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.*.mean, 4)
diff --git a/grafana/nodepool-limestone.yaml b/grafana/nodepool-limestone.yaml
index 443574f261..792a1ee22d 100644
--- a/grafana/nodepool-limestone.yaml
+++ b/grafana/nodepool-limestone.yaml
@@ -148,7 +148,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.servers.*.mean, 4)
         - title: GET Server
           type: graph
           span: 4
@@ -160,7 +160,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.*.mean, 4)
         - title: DELETE Server
           type: graph
           span: 4
@@ -172,7 +172,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.*.mean, 4)
         - title: GET Servers Details
           type: graph
           lines: true
@@ -183,7 +183,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers_detail.*.mean, 4)
         - title: GET Limits
           type: graph
           lines: true
@@ -194,7 +194,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.*.mean, 4)
         - title: GET Flavors
           type: graph
           lines: true
@@ -205,7 +205,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors_detail.*.mean, 4)
         - title: GET network floatingips
           type: graph
           lines: true
@@ -216,7 +216,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.*.mean, 4)
         - title: GET networks
           type: graph
           lines: true
@@ -227,7 +227,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.*.mean, 4)
         - title: GET network ports
           type: graph
           lines: true
@@ -238,7 +238,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.*.mean, 4)
         - title: GET network subnets
           type: graph
           lines: true
@@ -249,4 +249,4 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.*.mean, 4)
diff --git a/grafana/nodepool-linaro.yaml b/grafana/nodepool-linaro.yaml
index 482dc90880..c0f9441c48 100644
--- a/grafana/nodepool-linaro.yaml
+++ b/grafana/nodepool-linaro.yaml
@@ -148,7 +148,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.servers.*.mean, 4)
         - title: GET Server
           type: graph
           span: 4
@@ -160,7 +160,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.*.mean, 4)
         - title: DELETE Server
           type: graph
           span: 4
@@ -172,7 +172,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.*.mean, 4)
         - title: GET Servers Details
           type: graph
           lines: true
@@ -183,7 +183,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers_detail.*.mean, 4)
         - title: GET Limits
           type: graph
           lines: true
@@ -194,7 +194,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.*.mean, 4)
         - title: GET Flavors
           type: graph
           lines: true
@@ -205,7 +205,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors_detail.*.mean, 4)
         - title: GET network floatingips
           type: graph
           lines: true
@@ -216,7 +216,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.*.mean, 4)
         - title: GET networks
           type: graph
           lines: true
@@ -227,7 +227,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.*.mean, 4)
         - title: GET network ports
           type: graph
           lines: true
@@ -238,7 +238,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.*.mean, 4)
         - title: GET network subnets
           type: graph
           lines: true
@@ -249,4 +249,4 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.*.mean, 4)
diff --git a/grafana/nodepool-osuosl.yaml b/grafana/nodepool-osuosl.yaml
index 1f42c526d4..738362f929 100644
--- a/grafana/nodepool-osuosl.yaml
+++ b/grafana/nodepool-osuosl.yaml
@@ -148,7 +148,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.servers.*.mean, 4)
         - title: GET Server
           type: graph
           span: 4
@@ -160,7 +160,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.*.mean, 4)
         - title: DELETE Server
           type: graph
           span: 4
@@ -172,7 +172,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.*.mean, 4)
         - title: GET Servers Details
           type: graph
           lines: true
@@ -183,7 +183,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers_detail.*.mean, 4)
         - title: GET Limits
           type: graph
           lines: true
@@ -194,7 +194,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.*.mean, 4)
         - title: GET Flavors
           type: graph
           lines: true
@@ -205,7 +205,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors_detail.*.mean, 4)
         - title: GET network floatingips
           type: graph
           lines: true
@@ -216,7 +216,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.*.mean, 4)
         - title: GET networks
           type: graph
           lines: true
@@ -227,7 +227,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.*.mean, 4)
         - title: GET network ports
           type: graph
           lines: true
@@ -238,7 +238,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.*.mean, 4)
         - title: GET network subnets
           type: graph
           lines: true
@@ -249,4 +249,4 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.*.mean, 4)
diff --git a/grafana/nodepool-ovh.yaml b/grafana/nodepool-ovh.yaml
index 314c0ec0ef..896ce1b468 100644
--- a/grafana/nodepool-ovh.yaml
+++ b/grafana/nodepool-ovh.yaml
@@ -148,7 +148,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.servers.*.mean, 4)
         - title: GET Server
           type: graph
           span: 4
@@ -160,7 +160,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.*.mean, 4)
         - title: DELETE Server
           type: graph
           span: 4
@@ -172,7 +172,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.*.mean, 4)
         - title: GET Servers Details
           type: graph
           lines: true
@@ -183,7 +183,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers_detail.*.mean, 4)
         - title: GET Limits
           type: graph
           lines: true
@@ -194,7 +194,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.*.mean, 4)
         - title: GET Flavors
           type: graph
           lines: true
@@ -205,7 +205,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors_detail.*.mean, 4)
         - title: GET network floatingips
           type: graph
           lines: true
@@ -216,7 +216,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.*.mean, 4)
         - title: GET networks
           type: graph
           lines: true
@@ -227,7 +227,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.*.mean, 4)
         - title: GET network ports
           type: graph
           lines: true
@@ -238,7 +238,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.*.mean, 4)
         - title: GET network subnets
           type: graph
           lines: true
@@ -249,4 +249,4 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.*.mean, 4)
diff --git a/grafana/nodepool-rax.yaml b/grafana/nodepool-rax.yaml
index fefb4d9cdc..bbee34dfa5 100644
--- a/grafana/nodepool-rax.yaml
+++ b/grafana/nodepool-rax.yaml
@@ -148,7 +148,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.servers.*.mean, 4)
         - title: GET Server
           type: graph
           span: 4
@@ -160,7 +160,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.*.mean, 4)
         - title: DELETE Server
           type: graph
           span: 4
@@ -172,7 +172,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.*.mean, 4)
         - title: GET Servers Details
           type: graph
           lines: true
@@ -183,7 +183,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers_detail.*.mean, 4)
         - title: GET Limits
           type: graph
           lines: true
@@ -194,7 +194,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.*.mean, 4)
         - title: GET Flavors
           type: graph
           lines: true
@@ -205,7 +205,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors_detail.*.mean, 4)
         - title: GET network floatingips
           type: graph
           lines: true
@@ -216,7 +216,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.*.mean, 4)
         - title: GET networks
           type: graph
           lines: true
@@ -227,7 +227,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.*.mean, 4)
         - title: GET network ports
           type: graph
           lines: true
@@ -238,7 +238,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.*.mean, 4)
         - title: GET network subnets
           type: graph
           lines: true
@@ -249,4 +249,4 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.*.mean, 4)
diff --git a/grafana/nodepool-vexxhost.yaml b/grafana/nodepool-vexxhost.yaml
index ea38655c29..da9a0171f2 100644
--- a/grafana/nodepool-vexxhost.yaml
+++ b/grafana/nodepool-vexxhost.yaml
@@ -148,7 +148,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.servers.*.mean, 4)
         - title: GET Server
           type: graph
           span: 4
@@ -160,7 +160,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.*.mean, 4)
         - title: DELETE Server
           type: graph
           span: 4
@@ -172,7 +172,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.*.mean, 4)
         - title: GET Servers Details
           type: graph
           lines: true
@@ -183,7 +183,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers_detail.*.mean, 4)
         - title: GET Limits
           type: graph
           lines: true
@@ -194,7 +194,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.*.mean, 4)
         - title: GET Flavors
           type: graph
           lines: true
@@ -205,7 +205,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors_detail.*.mean, 4)
         - title: GET network floatingips
           type: graph
           lines: true
@@ -216,7 +216,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.*.mean, 4)
         - title: GET networks
           type: graph
           lines: true
@@ -227,7 +227,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.*.mean, 4)
         - title: GET network ports
           type: graph
           lines: true
@@ -238,7 +238,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.*.mean, 4)
         - title: GET network subnets
           type: graph
           lines: true
@@ -249,4 +249,4 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.*.mean, 4)
diff --git a/grafana/nodepool.template b/grafana/nodepool.template
index 6b4b85ba4a..a6e05e5169 100644
--- a/grafana/nodepool.template
+++ b/grafana/nodepool.template
@@ -148,7 +148,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.servers.*.mean, 4)
         - title: GET Server
           type: graph
           span: 4
@@ -160,7 +160,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.*.mean, 4)
         - title: DELETE Server
           type: graph
           span: 4
@@ -172,7 +172,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.*.mean, 4)
         - title: GET Servers Details
           type: graph
           lines: true
@@ -183,7 +183,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers_detail.*.mean, 4)
         - title: GET Limits
           type: graph
           lines: true
@@ -194,7 +194,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.*.mean, 4)
         - title: GET Flavors
           type: graph
           lines: true
@@ -205,7 +205,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors.detail.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors_detail.*.mean, 4)
         - title: GET network floatingips
           type: graph
           lines: true
@@ -216,7 +216,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.*.mean, 4)
         - title: GET networks
           type: graph
           lines: true
@@ -227,7 +227,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.*.mean, 4)
         - title: GET network ports
           type: graph
           lines: true
@@ -238,7 +238,7 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.*.mean, 4)
         - title: GET network subnets
           type: graph
           lines: true
@@ -249,4 +249,4 @@ dashboard:
               label: Time
             - show: false
           targets:
-            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.mean, 4)
+            - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.*.mean, 4)