diff --git a/grafana/neutron-lib.yaml b/grafana/neutron-lib.yaml
index 8f40f21df7..7fbf659296 100644
--- a/grafana/neutron-lib.yaml
+++ b/grafana/neutron-lib.yaml
@@ -40,15 +40,15 @@ dashboard:
         - title: Periodic jobs
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron.master.job.legacy-periodic-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron.master.job.legacy-periodic-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (neutron)')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-bagpipe.master.job.legacy-periodic-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-bagpipe.master.job.legacy-periodic-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (networking-bagpipe)')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-bgpvpn.master.job.legacy-periodic-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-bgpvpn.master.job.legacy-periodic-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (networking-bgpvpn)')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-midonet.master.job.legacy-periodic-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-midonet.master.job.legacy-periodic-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (networking-midonet)')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-odl.master.job.legacy-periodic-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-odl.master.job.legacy-periodic-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (networking-odl)')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-ovn.master.job.legacy-periodic-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-ovn.master.job.legacy-periodic-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (networking-ovn)')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-sfc.master.job.legacy-periodic-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-sfc.master.job.legacy-periodic-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (networking-sfc)')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron-dynamic-routing.master.job.legacy-periodic-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron-dynamic-routing.master.job.legacy-periodic-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (neutron-dynamic-routing)')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron-fwaas.master.job.legacy-periodic-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron-fwaas.master.job.legacy-periodic-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (neutron-fwaas)')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron-vpnaas.master.job.legacy-periodic-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron-vpnaas.master.job.legacy-periodic-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (neutron-vpnaas)')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_vmware-nsx.master.job.legacy-periodic-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_vmware-nsx.master.job.legacy-periodic-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (vmware-nsx)')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron.master.job.openstack-tox-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron.master.job.openstack-tox-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (neutron)')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-bagpipe.master.job.openstack-tox-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-bagpipe.master.job.openstack-tox-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (networking-bagpipe)')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-bgpvpn.master.job.openstack-tox-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-bgpvpn.master.job.openstack-tox-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (networking-bgpvpn)')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-midonet.master.job.openstack-tox-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-midonet.master.job.openstack-tox-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (networking-midonet)')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-odl.master.job.openstack-tox-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-odl.master.job.openstack-tox-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (networking-odl)')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-ovn.master.job.openstack-tox-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-ovn.master.job.openstack-tox-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (networking-ovn)')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-sfc.master.job.openstack-tox-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_networking-sfc.master.job.openstack-tox-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (networking-sfc)')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron-dynamic-routing.master.job.openstack-tox-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron-dynamic-routing.master.job.openstack-tox-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (neutron-dynamic-routing)')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron-fwaas.master.job.openstack-tox-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron-fwaas.master.job.openstack-tox-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (neutron-fwaas)')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron-vpnaas.master.job.openstack-tox-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_neutron-vpnaas.master.job.openstack-tox-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (neutron-vpnaas)')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_vmware-nsx.master.job.openstack-tox-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.git_openstack_org.openstack_vmware-nsx.master.job.openstack-tox-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'legacy-periodic-py35-with-neutron-lib-master (vmware-nsx)')
           type: graph