diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 33ed5eb3ee..4caa16ed26 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -886,10 +886,10 @@ project-templates:
       - gate-puppet-openstack-integration-4-scenario002-tempest-centos-7
       - gate-puppet-openstack-integration-4-scenario003-tempest-centos-7
       - gate-puppet-openstack-integration-4-scenario004-tempest-centos-7
-      - gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
-      - gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
-      - gate-puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
-      - gate-puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial
+      - gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial-nv
+      - gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial-nv
+      - gate-puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial-nv
+      - gate-puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial-nv
     gate:
       - gate-puppet-openstack-integration-3-scenario001-tempest-ubuntu-trusty
       - gate-puppet-openstack-integration-3-scenario001-tempest-centos-7
@@ -901,53 +901,45 @@ project-templates:
       - gate-puppet-openstack-integration-4-scenario002-tempest-centos-7
       - gate-puppet-openstack-integration-4-scenario003-tempest-centos-7
       - gate-puppet-openstack-integration-4-scenario004-tempest-centos-7
-      - gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
-      - gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
-      - gate-puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
-      - gate-puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial
 
   - name: puppet-openstack-integration-jobs-scenario001
     check:
       - gate-puppet-openstack-integration-3-scenario001-tempest-ubuntu-trusty
       - gate-puppet-openstack-integration-3-scenario001-tempest-centos-7
-      - gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
+      - gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial-nv
       - gate-puppet-openstack-integration-4-scenario001-tempest-centos-7
     gate:
       - gate-puppet-openstack-integration-3-scenario001-tempest-ubuntu-trusty
       - gate-puppet-openstack-integration-3-scenario001-tempest-centos-7
-      - gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
       - gate-puppet-openstack-integration-4-scenario001-tempest-centos-7
 
   - name: puppet-openstack-integration-jobs-scenario002
     check:
       - gate-puppet-openstack-integration-3-scenario002-tempest-ubuntu-trusty
       - gate-puppet-openstack-integration-3-scenario002-tempest-centos-7
-      - gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
+      - gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial-nv
       - gate-puppet-openstack-integration-4-scenario002-tempest-centos-7
     gate:
       - gate-puppet-openstack-integration-3-scenario002-tempest-ubuntu-trusty
       - gate-puppet-openstack-integration-3-scenario002-tempest-centos-7
-      - gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
       - gate-puppet-openstack-integration-4-scenario002-tempest-centos-7
 
   - name: puppet-openstack-integration-jobs-scenario003
     check:
       - gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-trusty
       - gate-puppet-openstack-integration-3-scenario003-tempest-centos-7
-      - gate-puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
+      - gate-puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial-nv
       - gate-puppet-openstack-integration-4-scenario003-tempest-centos-7
     gate:
       - gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-trusty
       - gate-puppet-openstack-integration-3-scenario003-tempest-centos-7
-      - gate-puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
       - gate-puppet-openstack-integration-4-scenario003-tempest-centos-7
 
   - name: puppet-openstack-integration-jobs-scenario004
     check:
-      - gate-puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial
+      - gate-puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial-nv
       - gate-puppet-openstack-integration-4-scenario004-tempest-centos-7
     gate:
-      - gate-puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial
       - gate-puppet-openstack-integration-4-scenario004-tempest-centos-7
 
   - name: puppet-openstack-libraries-jobs