diff --git a/grafana/networking-odl.yaml b/grafana/networking-odl.yaml
index c4e560bd8c..02808b6a61 100644
--- a/grafana/networking-odl.yaml
+++ b/grafana/networking-odl.yaml
@@ -50,6 +50,8 @@ dashboard:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-boron-snapshot-v2driver.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-boron-snapshot-v1driver.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-boron-snapshot-v2driver')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-v1driver.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-v1driver.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-carbon-snapshot-v1driver')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-v2driver.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-v1driver.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-carbon-snapshot-v2driver')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v1driver-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-v1driver.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v1driver-nv')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v2driver-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-v2driver.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v2driver-nv')
           type: graph
         - title: Tempest Failure Rates (Gate queue)
           span: 4
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index da281b8b8f..ce45641756 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -12346,6 +12346,8 @@ projects:
       - gate-tempest-dsvm-networking-odl-carbon-snapshot-v1driver-mitaka-nv
       - gate-tempest-dsvm-networking-odl-carbon-snapshot-v2driver
       - gate-tempest-dsvm-networking-odl-carbon-snapshot-v2driver-nv
+      - gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v1driver-nv
+      - gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v2driver-nv
       # NOTE(mkolesni): Keep this for checking latest ODL with V1 until we drop
       # the V1 driver support.
       - gate-tempest-dsvm-networking-odl-carbon-snapshot-v1driver
@@ -12370,8 +12372,6 @@ projects:
     experimental:
       - gate-tempest-dsvm-networking-odl-boron-snapshot-vpnservice-v1driver-nv
       - gate-tempest-dsvm-networking-odl-boron-snapshot-vpnservice-v2driver-nv
-      - gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v1driver-nv
-      - gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v2driver-nv
     post:
       - networking-odl-coverage-ubuntu-trusty
       - networking-odl-coverage-ubuntu-xenial