diff --git a/grafana/tap-as-a-service.yaml b/grafana/tap-as-a-service.yaml
index 2b2be68a0f..d3f9fc3ce8 100644
--- a/grafana/tap-as-a-service.yaml
+++ b/grafana/tap-as-a-service.yaml
@@ -16,22 +16,24 @@ dashboard:
         - title: Unit Tests Failure Rates (Check queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tap-as-a-service-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tap-as-a-service-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-tap-as-a-service-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tap-as-a-service-python35.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tap-as-a-service-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-tap-as-a-service-python35')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_tap-as-a-service.master.job.openstack-tox-py27.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_tap-as-a-service.master.job.openstack-tox-py27.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-tox-py27')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_tap-as-a-service.master.job.openstack-tox-py35.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_tap-as-a-service.master.job.openstack-tox-py35.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-tox-py35')
           type: graph
         - title: Unit Tests Failure Rates (Gate queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tap-as-a-service-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tap-as-a-service-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-tap-as-a-service-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tap-as-a-service-python35.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tap-as-a-service-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-tap-as-a-service-python35')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_tap-as-a-service.master.job.openstack-tox-py27.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_tap-as-a-service.master.job.openstack-tox-py27.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-tox-py27')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_tap-as-a-service.master.job.openstack-tox-py35.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_tap-as-a-service.master.job.openstack-tox-py35.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-tox-py35')
           type: graph
         - title: Tempest Failure Rates (Check queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-tap-as-a-service.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-tap-as-a-service.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-tap-as-a-service')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_tap-as-a-service.master.job.tap-as-a-service-tempest-dsvm.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_tap-as-a-service.master.job.tap-as-a-service-tempest-dsvm.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'tap-as-a-service-tempest-dsvm')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_tap-as-a-service.master.job.tap-as-a-service-tempest-plugin.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_tap-as-a-service.master.job.tap-as-a-service-tempest-plugin.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'tap-as-a-service-tempest-plugin')
           type: graph
         - title: Tempest Failure Rates (Gate queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-tap-as-a-service.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-tap-as-a-service.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-tap-as-a-service')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_tap-as-a-service.master.job.tap-as-a-service-tempest-dsvm.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_tap-as-a-service.master.job.tap-as-a-service-tempest-dsvm.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'tap-as-a-service-tempest-dsvm')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_tap-as-a-service.master.job.tap-as-a-service-tempest-plugin.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_tap-as-a-service.master.job.tap-as-a-service-tempest-plugin.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'tap-as-a-service-tempest-plugin')
           type: graph