diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 72e8497602..54c0a05765 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -8592,10 +8592,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
       - name: release-notes-jobs
+      - name: ansible-role-functional-jobs-centos7-nv
       - name: ansible-role-functional-jobs-trusty
       - name: ansible-role-functional-jobs-xenial-nv
-    experimental:
-      - gate-openstack-ansible-os_aodh-ansible-func-centos-7-nv
     release:
       - openstack-ansible-os_aodh-announce-release
 
@@ -8618,10 +8617,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
       - name: release-notes-jobs
+      - name: ansible-role-functional-jobs-centos7-nv
       - name: ansible-role-functional-jobs-trusty
       - name: ansible-role-functional-jobs-xenial-nv
-    experimental:
-      - gate-openstack-ansible-os_ceilometer-ansible-func-centos-7-nv
     release:
       - openstack-ansible-os_ceilometer-announce-release
 
@@ -8631,10 +8629,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
       - name: release-notes-jobs
+      - name: ansible-role-functional-jobs-centos7-nv
       - name: ansible-role-functional-jobs-trusty
       - name: ansible-role-functional-jobs-xenial-nv
-    experimental:
-      - gate-openstack-ansible-os_cinder-ansible-func-centos-7-nv
     release:
       - openstack-ansible-os_cinder-announce-release
 
@@ -8670,10 +8667,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
       - name: release-notes-jobs
+      - name: ansible-role-functional-jobs-centos7-nv
       - name: ansible-role-functional-jobs-trusty
       - name: ansible-role-functional-jobs-xenial-nv
-    experimental:
-      - gate-openstack-ansible-os_glance-ansible-func-centos-7-nv
     release:
       - openstack-ansible-os_glance-announce-release
 
@@ -8696,10 +8692,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
       - name: release-notes-jobs
+      - name: ansible-role-functional-jobs-centos7-nv
       - name: ansible-role-functional-jobs-trusty
       - name: ansible-role-functional-jobs-xenial-nv
-    experimental:
-      - gate-openstack-ansible-os_heat-ansible-func-centos-7-nv
     release:
       - openstack-ansible-os_heat-announce-release
 
@@ -8709,10 +8704,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
       - name: release-notes-jobs
+      - name: ansible-role-functional-jobs-centos7-nv
       - name: ansible-role-functional-jobs-trusty
       - name: ansible-role-functional-jobs-xenial-nv
-    experimental:
-      - gate-openstack-ansible-os_horizon-ansible-func-centos-7-nv
     release:
       - openstack-ansible-os_horizon-announce-release
 
@@ -8722,10 +8716,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
       - name: release-notes-jobs
+      - name: ansible-role-functional-jobs-centos7-nv
       - name: ansible-role-functional-jobs-trusty
       - name: ansible-role-functional-jobs-xenial-nv
-    experimental:
-      - gate-openstack-ansible-os_ironic-ansible-func-centos-7-nv
     release:
       - openstack-ansible-os_ironic-announce-release
 
@@ -8735,10 +8728,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
       - name: release-notes-jobs
+      - name: ansible-role-functional-jobs-centos7-nv
       - name: ansible-role-functional-jobs-trusty
       - name: ansible-role-functional-jobs-xenial-nv
-    experimental:
-      - gate-openstack-ansible-os_keystone-ansible-func-centos-7-nv
     release:
       - openstack-ansible-os_keystone-announce-release
 
@@ -8761,10 +8753,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
       - name: release-notes-jobs
+      - name: ansible-role-functional-jobs-centos7-nv
       - name: ansible-role-functional-jobs-trusty
       - name: ansible-role-functional-jobs-xenial-nv
-    experimental:
-      - gate-openstack-ansible-os_neutron-ansible-func-centos-7-nv
     release:
       - openstack-ansible-os_neutron-announce-release
 
@@ -8774,10 +8765,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
       - name: release-notes-jobs
+      - name: ansible-role-functional-jobs-centos7-nv
       - name: ansible-role-functional-jobs-trusty
       - name: ansible-role-functional-jobs-xenial-nv
-    experimental:
-      - gate-openstack-ansible-os_nova-ansible-func-centos-7-nv
     release:
       - openstack-ansible-os_nova-announce-release
 
@@ -8813,10 +8803,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
       - name: release-notes-jobs
+      - name: ansible-role-functional-jobs-centos7-nv
       - name: ansible-role-functional-jobs-trusty
       - name: ansible-role-functional-jobs-xenial-nv
-    experimental:
-      - gate-openstack-ansible-os_swift-ansible-func-centos-7-nv
     release:
       - openstack-ansible-os_swift-announce-release
 
@@ -8826,10 +8815,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
       - name: release-notes-jobs
+      - name: ansible-role-functional-jobs-centos7-nv
       - name: ansible-role-functional-jobs-trusty
       - name: ansible-role-functional-jobs-xenial-nv
-    experimental:
-      - gate-openstack-ansible-os_tempest-ansible-func-centos-7-nv
 
   - name: openstack/openstack-ansible-os_zaqar
     template: