diff --git a/grafana/neutron-tempest-plugin.yaml b/grafana/neutron-tempest-plugin.yaml
index a44b225c97..cf1b2693ad 100644
--- a/grafana/neutron-tempest-plugin.yaml
+++ b/grafana/neutron-tempest-plugin.yaml
@@ -53,7 +53,8 @@ dashboard:
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-bgpvpn-bagpipe.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-bgpvpn-bagpipe.{SUCCESS,FAILURE})),'24hours'), 'neutron-tempest-plugin-bgpvpn-bagpipe')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-dynamic-routing.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-dynamic-routing.{SUCCESS,FAILURE})),'24hours'), 'neutron-tempest-plugin-dynamic-routing')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas.{SUCCESS,FAILURE})),'24hours'), 'neutron-tempest-plugin-fwaas')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas-openvswitch.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas-openvswitch.{SUCCESS,FAILURE})),'24hours'), 'neutron-tempest-plugin-fwaas-openvswitch')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas-ovn.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas-ovn.{SUCCESS,FAILURE})),'24hours'), 'neutron-tempest-plugin-fwaas-ovn')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-sfc.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-sfc.{SUCCESS,FAILURE})),'24hours'), 'neutron-tempest-plugin-sfc')
           type: graph
         - title: Number of Stadium Failures (Gate queue)
@@ -61,7 +62,8 @@ dashboard:
           targets:
             - target: alias(summarize(sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-bgpvpn-bagpipe.{SUCCESS,FAILURE,TIMED_OUT}),'24hours'), 'neutron-tempest-plugin-bgpvpn-bagpipe')
             - target: alias(summarize(sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-dynamic-routing.{SUCCESS,FAILURE,TIMED_OUT}),'24hours'), 'neutron-tempest-plugin-dynamic-routing')
-            - target: alias(summarize(sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas.{SUCCESS,FAILURE,TIMED_OUT}),'24hours'), 'neutron-tempest-plugin-fwaas')
+            - target: alias(summarize(sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas-openvswitch.{SUCCESS,FAILURE,TIMED_OUT}),'24hours'), 'neutron-tempest-plugin-fwaas-openvswitch')
+            - target: alias(summarize(sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas-ovn.{SUCCESS,FAILURE,TIMED_OUT}),'24hours'), 'neutron-tempest-plugin-fwaas-ovn')
             - target: alias(summarize(sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-sfc.{SUCCESS,FAILURE,TIMED_OUT}),'24hours'), 'neutron-tempest-plugin-sfc')
           type: graph
         - title: Documentation and Linter Failure Rates (Gate queue)
@@ -248,7 +250,8 @@ dashboard:
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-bgpvpn-bagpipe.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-bgpvpn-bagpipe.{SUCCESS,FAILURE})),'24hours'), 'neutron-tempest-plugin-bgpvpn-bagpipe')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-dynamic-routing.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-dynamic-routing.{SUCCESS,FAILURE})),'24hours'), 'neutron-tempest-plugin-dynamic-routing')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas.{SUCCESS,FAILURE})),'24hours'), 'neutron-tempest-plugin-fwaas')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas-openvswitch.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas-openvswitch.{SUCCESS,FAILURE})),'24hours'), 'neutron-tempest-plugin-fwaas-openvswitch')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas-ovn.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas-ovn.{SUCCESS,FAILURE})),'24hours'), 'neutron-tempest-plugin-fwaas-ovn')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-sfc.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-sfc.{SUCCESS,FAILURE})),'24hours'), 'neutron-tempest-plugin-sfc')
           type: graph
         - title: Number of Stadium Failures (Check queue)
@@ -256,7 +259,8 @@ dashboard:
           targets:
             - target: alias(summarize(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-bgpvpn-bagpipe.{SUCCESS,FAILURE,TIMED_OUT}),'24hours'), 'neutron-tempest-plugin-bgpvpn-bagpipe')
             - target: alias(summarize(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-dynamic-routing.{SUCCESS,FAILURE,TIMED_OUT}),'24hours'), 'neutron-tempest-plugin-dynamic-routing')
-            - target: alias(summarize(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas.{SUCCESS,FAILURE,TIMED_OUT}),'24hours'), 'neutron-tempest-plugin-fwaas')
+            - target: alias(summarize(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas-openvswitch.{SUCCESS,FAILURE,TIMED_OUT}),'24hours'), 'neutron-tempest-plugin-fwaas-openvswitch')
+            - target: alias(summarize(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-fwaas-ovn.{SUCCESS,FAILURE,TIMED_OUT}),'24hours'), 'neutron-tempest-plugin-fwaas-ovn')
             - target: alias(summarize(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_neutron-tempest-plugin.master.job.neutron-tempest-plugin-sfc.{SUCCESS,FAILURE,TIMED_OUT}),'24hours'), 'neutron-tempest-plugin-sfc')
           type: graph
         - title: Documentation and Linter Failure Rates (Check queue)