diff --git a/.zuul.yaml b/.zuul.yaml
index 2317db164..e1e9291f2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -263,10 +263,18 @@
         - puppet-openstack-integration-4-scenario002-tempest-centos-7
         - puppet-openstack-integration-4-scenario003-tempest-centos-7
         - puppet-openstack-integration-4-scenario004-tempest-centos-7
+        - puppet-openstack-integration-5-scenario001-tempest-centos-7
+        - puppet-openstack-integration-5-scenario002-tempest-centos-7
+        - puppet-openstack-integration-5-scenario003-tempest-centos-7
+        - puppet-openstack-integration-5-scenario004-tempest-centos-7
         - puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
         - puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
         - puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
         - puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial
+        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-xenial
+        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-xenial
+        - puppet-openstack-integration-5-scenario003-tempest-ubuntu-xenial
+        - puppet-openstack-integration-5-scenario004-tempest-ubuntu-xenial
         - puppet-openstack-integration-4-scenario001-tempest-debian-stable:
             voting: false
         - puppet-openstack-integration-4-scenario002-tempest-debian-stable:
@@ -281,20 +289,20 @@
         - puppet-openstack-integration-4-scenario002-tempest-centos-7
         - puppet-openstack-integration-4-scenario003-tempest-centos-7
         - puppet-openstack-integration-4-scenario004-tempest-centos-7
-        - puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
-        - puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
-        - puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
-        - puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial
-    experimental:
-      jobs:
         - puppet-openstack-integration-5-scenario001-tempest-centos-7
         - puppet-openstack-integration-5-scenario002-tempest-centos-7
         - puppet-openstack-integration-5-scenario003-tempest-centos-7
         - puppet-openstack-integration-5-scenario004-tempest-centos-7
+        - puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
+        - puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
+        - puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
+        - puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial
         - puppet-openstack-integration-5-scenario001-tempest-ubuntu-xenial
         - puppet-openstack-integration-5-scenario002-tempest-ubuntu-xenial
         - puppet-openstack-integration-5-scenario003-tempest-ubuntu-xenial
         - puppet-openstack-integration-5-scenario004-tempest-ubuntu-xenial
+    experimental:
+      jobs:
         - puppet-openstack-integration-5-scenario001-tempest-debian-stable
         - puppet-openstack-integration-5-scenario002-tempest-debian-stable
         - puppet-openstack-integration-5-scenario003-tempest-debian-stable
@@ -305,17 +313,19 @@
     check:
       jobs:
         - puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
+        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-xenial
         - puppet-openstack-integration-4-scenario001-tempest-centos-7
+        - puppet-openstack-integration-5-scenario001-tempest-centos-7
         - puppet-openstack-integration-4-scenario001-tempest-debian-stable:
             voting: false
     gate:
       jobs:
         - puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
+        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-xenial
         - puppet-openstack-integration-4-scenario001-tempest-centos-7
+        - puppet-openstack-integration-5-scenario001-tempest-centos-7
     experimental:
       jobs:
-        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-xenial
-        - puppet-openstack-integration-5-scenario001-tempest-centos-7
         - puppet-openstack-integration-5-scenario001-tempest-debian-stable
 
 - project-template:
@@ -323,17 +333,19 @@
     check:
       jobs:
         - puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
+        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-xenial
         - puppet-openstack-integration-4-scenario002-tempest-centos-7
+        - puppet-openstack-integration-5-scenario002-tempest-centos-7
         - puppet-openstack-integration-4-scenario002-tempest-debian-stable:
             voting: false
     gate:
       jobs:
         - puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
+        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-xenial
         - puppet-openstack-integration-4-scenario002-tempest-centos-7
+        - puppet-openstack-integration-5-scenario002-tempest-centos-7
     experimental:
       jobs:
-        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-xenial
-        - puppet-openstack-integration-5-scenario002-tempest-centos-7
         - puppet-openstack-integration-5-scenario002-tempest-debian-stable
 
 - project-template:
@@ -341,36 +353,40 @@
     check:
       jobs:
         - puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
+        - puppet-openstack-integration-5-scenario003-tempest-ubuntu-xenial
         - puppet-openstack-integration-4-scenario003-tempest-centos-7
+        - puppet-openstack-integration-5-scenario003-tempest-centos-7
         - puppet-openstack-integration-4-scenario003-tempest-debian-stable:
             voting: false
     gate:
       jobs:
         - puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
+        - puppet-openstack-integration-5-scenario003-tempest-ubuntu-xenial
         - puppet-openstack-integration-4-scenario003-tempest-centos-7
+        - puppet-openstack-integration-5-scenario003-tempest-centos-7
     experimental:
       jobs:
-        - puppet-openstack-integration-5-scenario003-tempest-ubuntu-xenial
-        - puppet-openstack-integration-5-scenario003-tempest-centos-7
-        - puppet-openstack-integration-4-scenario003-tempest-debian-stable
+        - puppet-openstack-integration-5-scenario003-tempest-debian-stable
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario004
     check:
       jobs:
         - puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial
+        - puppet-openstack-integration-5-scenario004-tempest-ubuntu-xenial
         - puppet-openstack-integration-4-scenario004-tempest-centos-7
+        - puppet-openstack-integration-5-scenario004-tempest-centos-7
         - puppet-openstack-integration-4-scenario004-tempest-debian-stable:
             voting: false
     gate:
       jobs:
         - puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial
+        - puppet-openstack-integration-5-scenario004-tempest-ubuntu-xenial
         - puppet-openstack-integration-4-scenario004-tempest-centos-7
+        - puppet-openstack-integration-5-scenario004-tempest-centos-7
     experimental:
       jobs:
-        - puppet-openstack-integration-5-scenario004-tempest-ubuntu-xenial
-        - puppet-openstack-integration-5-scenario004-tempest-centos-7
-        - puppet-openstack-integration-4-scenario004-tempest-debian-stable
+        - puppet-openstack-integration-5-scenario004-tempest-debian-stable
 
 - job:
     name: puppet-openstack-module-base