diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 6e4ca33580..9f51395022 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -8601,10 +8601,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
 
@@ -8627,10 +8626,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
 
@@ -8640,10 +8638,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
 
@@ -8679,10 +8676,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
 
@@ -8705,10 +8701,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
 
@@ -8718,10 +8713,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
 
@@ -8731,10 +8725,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
 
@@ -8744,10 +8737,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
 
@@ -8770,10 +8762,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
 
@@ -8783,10 +8774,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
 
@@ -8822,10 +8812,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
 
@@ -8835,10 +8824,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: