diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index c7ca4c33e..43a43e7ad 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -55,10 +55,6 @@
     name: puppet-openstack-integration-jobs-all
     check:
       jobs:
-        - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-4-scenario002-tempest-centos-7
-        - puppet-openstack-integration-4-scenario003-tempest-centos-7
-        - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
         - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
         - puppet-openstack-integration-5-scenario002-tempest-centos-7
         - puppet-openstack-integration-5-scenario003-tempest-centos-7
@@ -67,14 +63,6 @@
         - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
         - puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic
         - puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-6-scenario002-tempest-centos-7
-        - puppet-openstack-integration-6-scenario003-tempest-centos-7
-        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
         - puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous:
             voting: false
         - puppet-openstack-integration-4-scenario002-tempest-debian-stable:
@@ -85,22 +73,12 @@
             voting: false
     gate:
       jobs:
-        - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-4-scenario002-tempest-centos-7
-        - puppet-openstack-integration-4-scenario003-tempest-centos-7
-        - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
         - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
         - puppet-openstack-integration-5-scenario002-tempest-centos-7
         - puppet-openstack-integration-5-scenario003-tempest-centos-7
         - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
         - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
         - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-6-scenario002-tempest-centos-7
-        - puppet-openstack-integration-6-scenario003-tempest-centos-7
-        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
     experimental:
       jobs:
         - puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous
@@ -111,91 +89,85 @@
         - puppet-openstack-integration-6-scenario002-tempest-debian-stable
         - puppet-openstack-integration-6-scenario003-tempest-debian-stable
         - puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
+        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-6-scenario002-tempest-centos-7
+        - puppet-openstack-integration-6-scenario003-tempest-centos-7
+        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
+        - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
+        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario001
     check:
       jobs:
         - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
         - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
         - puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous:
             voting: false
     gate:
       jobs:
         - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
         - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
     experimental:
       jobs:
         - puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous
         - puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
+        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario002
     check:
       jobs:
         - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-4-scenario002-tempest-centos-7
         - puppet-openstack-integration-5-scenario002-tempest-centos-7
-        - puppet-openstack-integration-6-scenario002-tempest-centos-7
         - puppet-openstack-integration-4-scenario002-tempest-debian-stable:
             voting: false
     gate:
       jobs:
         - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-4-scenario002-tempest-centos-7
         - puppet-openstack-integration-5-scenario002-tempest-centos-7
-        - puppet-openstack-integration-6-scenario002-tempest-centos-7
     experimental:
       jobs:
         - puppet-openstack-integration-5-scenario002-tempest-debian-stable
         - puppet-openstack-integration-6-scenario002-tempest-debian-stable
+        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
+        - puppet-openstack-integration-6-scenario002-tempest-centos-7
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario003
     check:
       jobs:
         - puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
-        - puppet-openstack-integration-4-scenario003-tempest-centos-7
         - puppet-openstack-integration-5-scenario003-tempest-centos-7
-        - puppet-openstack-integration-6-scenario003-tempest-centos-7
         - puppet-openstack-integration-4-scenario003-tempest-debian-stable:
             voting: false
     gate:
       jobs:
-        - puppet-openstack-integration-4-scenario003-tempest-centos-7
         - puppet-openstack-integration-5-scenario003-tempest-centos-7
-        - puppet-openstack-integration-6-scenario003-tempest-centos-7
     experimental:
       jobs:
         - puppet-openstack-integration-5-scenario003-tempest-debian-stable
         - puppet-openstack-integration-6-scenario003-tempest-debian-stable
+        - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
+        - puppet-openstack-integration-6-scenario003-tempest-centos-7
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario004
     check:
       jobs:
         - puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
         - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
         - puppet-openstack-integration-4-scenario004-tempest-debian-stable-luminous:
             voting: false
     gate:
       jobs:
-        - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
         - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
     experimental:
       jobs:
         - puppet-openstack-integration-5-scenario004-tempest-debian-stable-luminous
         - puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
+        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic