diff --git a/grafana/nodepool-tripleo-test-cloud.yaml b/grafana/nodepool-tripleo-test-cloud.yaml
index 50512baa96..0c86fce801 100644
--- a/grafana/nodepool-tripleo-test-cloud.yaml
+++ b/grafana/nodepool-tripleo-test-cloud.yaml
@@ -62,7 +62,7 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.ServerCreate.mean, '0.001'), 'SJC1')
+            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.ServerCreate.mean, '0.001'), 'RH1')
         - title: Delete Server
           type: graph
           span: 4
@@ -71,7 +71,7 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.ServerDelete.mean, '0.001'), 'SJC1')
+            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.ServerDelete.mean, '0.001'), 'RH1')
         - title: Get Server
           type: graph
           span: 4
@@ -80,7 +80,7 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.ServerGet.mean, '0.001'), 'SJC1')
+            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.ServerGet.mean, '0.001'), 'RH1')
         - title: List Servers
           type: graph
           span: 4
@@ -89,7 +89,7 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.ServerList.mean, '0.001'), 'SJC1')
+            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.ServerList.mean, '0.001'), 'RH1')
         - title: List Ports
           type: graph
           span: 4
@@ -98,7 +98,7 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.PortList.mean, '0.001'), 'SJC1')
+            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.PortList.mean, '0.001'), 'RH1')
         - title: Create Floating IP
           type: graph
           span: 4
@@ -107,7 +107,7 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.NeutronFloatingIPCreate.mean, '0.001'), 'SJC1')
+            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.NeutronFloatingIPCreate.mean, '0.001'), 'RH1')
         - title: Delete Floating IP
           type: graph
           span: 4
@@ -116,7 +116,7 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.NeutronFloatingIPDelete.mean, '0.001'), 'SJC1')
+            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.NeutronFloatingIPDelete.mean, '0.001'), 'RH1')
         - title: List Floating IPs
           type: graph
           span: 4
@@ -125,7 +125,7 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.NeutronFloatingIPList.mean, '0.001'), 'SJC1')
+            - target: alias(scale(stats.timers.nodepool.task.tripleo-test-cloud-rh1.NeutronFloatingIPList.mean, '0.001'), 'RH1')
     - title: Node Launches
       showTitle: true
       height: 250px
@@ -136,14 +136,14 @@ dashboard:
           nullPointMode: null as zero
           leftYAxisLabel: "events / min"
           targets:
-            - target: alias(smartSummarize(stats_counts.nodepool.launch.provider.tripleo-test-cloud-rh1.ready, '1m'), 'SJC1')
+            - target: alias(smartSummarize(stats_counts.nodepool.launch.provider.tripleo-test-cloud-rh1.ready, '1m'), 'RH1')
         - title: Error Node Launch Attempts
           type: graph
           span: 4
           nullPointMode: null as zero
           leftYAxisLabel: "events / min"
           targets:
-            - target: alias(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.tripleo-test-cloud-rh1.error.*), '1m'), 'SJC1')
+            - target: alias(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.tripleo-test-cloud-rh1.error.*), '1m'), 'RH1')
         - title: Time to Ready
           type: graph
           span: 4
@@ -152,8 +152,8 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.launch.provider.tripleo-test-cloud-rh1.ready.mean, '0.001'), 'SJC1')
-        - title: Test Nodes (SJC1)
+            - target: alias(scale(stats.timers.nodepool.launch.provider.tripleo-test-cloud-rh1.ready.mean, '0.001'), 'RH1')
+        - title: Test Nodes (RH1)
           type: graph
           span: 4
           stack: true
@@ -181,7 +181,7 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.tripleo-test-cloud-rh1.runtime.mean, '0.001'), 'SJC1')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.tripleo-test-cloud-rh1.runtime.mean, '0.001'), 'RH1')
         - title: gate-tempest-dsvm-neutron-full
           type: graph
           span: 6
@@ -190,4 +190,4 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.tripleo-test-cloud-rh1.runtime.mean, '0.001'), 'SJC1')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.tripleo-test-cloud-rh1.runtime.mean, '0.001'), 'RH1')