diff --git a/grafana/kolla.yaml b/grafana/kolla.yaml
index 25472f6f53..43719f721f 100644
--- a/grafana/kolla.yaml
+++ b/grafana/kolla.yaml
@@ -1,5 +1,8 @@
 dashboard:
   title: Kolla Failure Rate
+  time:
+      from: "now-7d"
+      to: "now"
   rows:
     - title: Description
       height: 100px
@@ -9,6 +12,7 @@ dashboard:
             **This dashboard is managed by [Grafyaml](http://docs.openstack.org/infra/system-config/grafyaml.html).**
 
             If you would like to make changes to this dashboard, please see the grafana directory in [project-config](https://git.openstack.org/cgit/openstack-infra/project-config/tree/grafana/kolla.yaml).
+            NOTE - 'No datapoints' in a graph means there have been no job failures reported yet.
           type: text
     - title: Graphs
       height: 320px
@@ -16,28 +20,14 @@ dashboard:
         - title: Source Build Failure Rates (Check queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-build-centos-source-centos-7.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-build-centos-source-centos-7.{SUCCESS,FAILURE})),'24hours'), 'gate-kolla-build-source-centos')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-build-ubuntu-source-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-build-ubuntu-source-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-kolla-build-source-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-build-oraclelinux-source-centos-7.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-build-oraclelinux-source-centos-7.{SUCCESS,FAILURE})),'24hours'), 'gate-kolla-build-source-oraclelinux')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_kolla.master.job.kolla-build-centos-source.{FAILURE,TIMED_OUT}),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_kolla.master.job.kolla-build-centos-source.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-build-centos-source')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_kolla.master.job.kolla-build-ubuntu-source.{FAILURE,TIMED_OUT}),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_kolla.master.job.kolla-build-ubuntu-source.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-build-ubuntu-source')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_kolla.master.job.kolla-build-oraclelinux-source.{FAILURE,TIMED_OUT}),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_kolla.master.job.kolla-build-oraclelinux-source.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'gate-kolla-build-source-oraclelinux')
           type: graph
         - title: Binary Build Failure Rates (Check queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-build-centos-binary-centos-7-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-build-centos-binary-centos-7-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-kolla-build-binary-centos')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-build-ubuntu-binary-ubuntu-xenial-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-build-ubuntu-binary-ubuntu-xenial-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-kolla-build-binary-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-build-oraclelinux-binary-centos-7-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-build-oraclelinux-binary-centos-7-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-kolla-build-binary-oraclelinux')
-          type: graph
-        - title: Source Deploy Failure Rates (Check queue)
-          span: 4
-          targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-deploy-centos-source-centos-7-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-deploy-centos-source-centos-7-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-kolla-deploy-source-centos')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-deploy-ubuntu-source-ubuntu-xenial-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-deploy-ubuntu-source-ubuntu-xenial-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-kolla-deploy-source-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-deploy-oraclelinux-source-centos-7-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-deploy-oraclelinux-source-centos-7-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-kolla-deploy-source-oraclelinux')
-          type: graph
-        - title: Binary Deploy Failure Rates (Check queue)
-          span: 4
-          targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-deploy-centos-binary-centos-7-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-deploy-centos-binary-centos-7-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-kolla-deploy-binary-centos')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-deploy-ubuntu-binary-ubuntu-xenial-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-deploy-ubuntu-binary-ubuntu-xenial-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-kolla-deploy-binary-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-deploy-oraclelinux-binary-centos-7-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-kolla-dsvm-deploy-oraclelinux-binary-centos-7-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-kolla-deploy-binary-oraclelinux')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_kolla.master.job.kolla-build-centos-binary.{FAILURE,TIMED_OUT),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_kolla.master.job.kolla-build-centos-binary.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-build-centos-binary')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_kolla.master.job.kolla-build-ubuntu-binary.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_kolla.master.job.kolla-build-ubuntu-binary.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-build-ubuntu-binary')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_kolla.master.job.kolla-build-oraclelinux-binary{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_kolla.master.job.kolla-build-oraclelinux-binary.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-build-oraclelinux-binary')
           type: graph