diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 513cfbfbd9..5fd290a787 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1451,7 +1451,6 @@ projects:
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
-    experimental-tripleo:
       - check-tripleo-novabm-overcloud-precise-nonha
     pre-release:
       - tuskar-tarball
@@ -1846,13 +1845,12 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     gate:
       - gate-diskimage-builder-pep8
       - gate-diskimage-builder-python26
       - gate-diskimage-builder-python27
       - gate-tempest-dsvm-ironic-pxe_ssh
-    experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - diskimage-builder-coverage
       - diskimage-builder-branch-tarball
@@ -1867,7 +1865,6 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
-    experimental-tripleo:
       - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - dib-utils-branch-tarball
@@ -2023,12 +2020,11 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     gate:
       - gate-os-apply-config-pep8
       - gate-os-apply-config-python26
       - gate-os-apply-config-python27
-    experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - os-apply-config-coverage
       - os-apply-config-branch-tarball
@@ -2044,7 +2040,6 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
-    experimental-tripleo:
       - check-tripleo-novabm-overcloud-precise-nonha
 
 #TODO: add docs
@@ -2062,12 +2057,11 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     gate:
       - gate-os-collect-config-pep8
       - gate-os-collect-config-python26
       - gate-os-collect-config-python27
-    experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - os-collect-config-coverage
       - os-collect-config-branch-tarball
@@ -2086,12 +2080,11 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     gate:
       - gate-os-net-config-pep8
       - gate-os-net-config-python26
       - gate-os-net-config-python27
-    experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - os-net-config-coverage
       - os-net-config-branch-tarball
@@ -2111,12 +2104,11 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     gate:
       - gate-os-refresh-config-pep8
       - gate-os-refresh-config-python26
       - gate-os-refresh-config-python27
-    experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - os-refresh-config-coverage
       - os-refresh-config-branch-tarball
@@ -2626,7 +2618,6 @@ projects:
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
       - check-tripleo-ironic-overcloud-precise-ha
-    experimental-tripleo:
       - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - tripleo-heat-templates-branch-tarball
@@ -2645,7 +2636,6 @@ projects:
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
       - check-tripleo-ironic-overcloud-precise-ha
-    experimental-tripleo:
       - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - tripleo-image-elements-branch-tarball
@@ -2660,10 +2650,10 @@ projects:
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
       - check-tripleo-ironic-overcloud-precise-ha
+      - check-tripleo-novabm-overcloud-precise-nonha
     gate:
       - gate-tripleo-incubator-docs
     experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise-nonha
       - check-tripleo-ironic-vlan-precise-nonha
     post:
       - tripleo-incubator-docs
@@ -3514,7 +3504,6 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
-    experimental-tripleo:
       - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack-infra/zmq-event-publisher