diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index d20d8aac2..a9634774d 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -13,100 +13,98 @@
         - tripleo-ci-centos-7-scenario001-multinode-oooq-container:
             files:
               - ^manifests/haproxy.*$
-              - ^manifests/profile/base/aodh.*$
-              - ^manifests/profile/base/ceilometer.*$
-              - ^manifests/profile/base/ceph.*$
-              - ^manifests/profile/base/cinder.*$
-              - ^manifests/profile/base/glance.*$
-              - ^manifests/profile/base/gnocchi.*$
-              - ^manifests/profile/base/logging.*$
-              - ^manifests/profile/base/metrics.*$
-              - ^manifests/profile/base/monitoring.*$
-              - ^manifests/profile/base/panko.*$
+              - ^manifests/profile/(base|pacemaker)/aodh.*$
+              - ^manifests/profile/(base|pacemaker)/ceilometer.*$
+              - ^manifests/profile/(base|pacemaker)/ceph.*$
+              - ^manifests/profile/(base|pacemaker)/cinder.*$
+              - ^manifests/profile/(base|pacemaker)/glance.*$
+              - ^manifests/profile/(base|pacemaker)/gnocchi.*$
+              - ^manifests/profile/(base|pacemaker)/logging.*$
+              - ^manifests/profile/(base|pacemaker)/metrics.*$
+              - ^manifests/profile/(base|pacemaker)/monitoring.*$
+              - ^manifests/profile/(base|pacemaker)/panko.*$
         - tripleo-ci-centos-7-scenario002-multinode-oooq-container:
             files:
               - ^manifests/haproxy.*$
-              - ^manifests/profile/base/aodh.*$
-              - ^manifests/profile/base/barbican.*$
-              - ^manifests/profile/base/ceilometer.*$
-              - ^manifests/profile/base/cinder.*$
-              - ^manifests/profile/base/glance.*$
-              - ^manifests/profile/base/gnocchi.*$
-              - ^manifests/profile/base/nova/ec2.*$
-              - ^manifests/profile/base/panko.*$
-              - ^manifests/profile/base/swift.*$
-              - ^manifests/profile/base/zaqar.*$
+              - ^manifests/profile/(base|pacemaker)/aodh.*$
+              - ^manifests/profile/(base|pacemaker)/barbican.*$
+              - ^manifests/profile/(base|pacemaker)/ceilometer.*$
+              - ^manifests/profile/(base|pacemaker)/cinder.*$
+              - ^manifests/profile/(base|pacemaker)/glance.*$
+              - ^manifests/profile/(base|pacemaker)/gnocchi.*$
+              - ^manifests/profile/(base|pacemaker)/nova/ec2.*$
+              - ^manifests/profile/(base|pacemaker)/panko.*$
+              - ^manifests/profile/(base|pacemaker)/swift.*$
+              - ^manifests/profile/(base|pacemaker)/zaqar.*$
         - tripleo-ci-centos-7-scenario003-multinode-oooq-container:
             files:
               - ^manifests/haproxy.*$
-              - ^manifests/profile/base/glance.*$
-              - ^manifests/profile/base/mistral.*$
-              - ^manifests/profile/base/sahara.*$
+              - ^manifests/profile/(base|pacemaker)/glance.*$
+              - ^manifests/profile/(base|pacemaker)/mistral.*$
+              - ^manifests/profile/(base|pacemaker)/sahara.*$
         - tripleo-ci-centos-7-scenario004-multinode-oooq-container:
             files:
               - ^manifests/haproxy.*$
-              - ^manifests/profile/base/ceph.*$
-              - ^manifests/profile/base/glance.*$
-              - ^manifests/profile/base/manila.*$
-              - ^manifests/profile/pacemaker/manila.*$
+              - ^manifests/profile/(base|pacemaker)/ceph.*$
+              - ^manifests/profile/(base|pacemaker)/glance.*$
+              - ^manifests/profile/(base|pacemaker)/manila.*$
         - tripleo-ci-centos-7-scenario007-multinode-oooq-container:
             files:
               - ^manifests/profile/pacemaker/ovn.*$
-              - ^manifests/profile/base/neutron/plugins/ml2/ovn.*$
-              - ^manifests/profile/base/neutron/agents/ovn.*$
-              - ^manifests/profile/base/neutron/ovn.*$
-              - ^manifests/profile/base/congress.*$
-              - ^manifests/profile/base/tacker.*$
+              - ^manifests/profile/(base|pacemaker)/neutron/plugins/ml2/ovn.*$
+              - ^manifests/profile/(base|pacemaker)/neutron/agents/ovn.*$
+              - ^manifests/profile/(base|pacemaker)/neutron/ovn.*$
+              - ^manifests/profile/(base|pacemaker)/congress.*$
+              - ^manifests/profile/(base|pacemaker)/tacker.*$
     gate:
       queue: tripleo
       jobs:
         - tripleo-ci-centos-7-scenario001-multinode-oooq-container:
             files:
               - ^manifests/haproxy.*$
-              - ^manifests/profile/base/aodh.*$
-              - ^manifests/profile/base/ceilometer.*$
-              - ^manifests/profile/base/ceph.*$
-              - ^manifests/profile/base/cinder.*$
-              - ^manifests/profile/base/glance.*$
-              - ^manifests/profile/base/gnocchi.*$
-              - ^manifests/profile/base/logging.*$
-              - ^manifests/profile/base/metrics.*$
-              - ^manifests/profile/base/monitoring.*$
-              - ^manifests/profile/base/panko.*$
+              - ^manifests/profile/(base|pacemaker)/aodh.*$
+              - ^manifests/profile/(base|pacemaker)/ceilometer.*$
+              - ^manifests/profile/(base|pacemaker)/ceph.*$
+              - ^manifests/profile/(base|pacemaker)/cinder.*$
+              - ^manifests/profile/(base|pacemaker)/glance.*$
+              - ^manifests/profile/(base|pacemaker)/gnocchi.*$
+              - ^manifests/profile/(base|pacemaker)/logging.*$
+              - ^manifests/profile/(base|pacemaker)/metrics.*$
+              - ^manifests/profile/(base|pacemaker)/monitoring.*$
+              - ^manifests/profile/(base|pacemaker)/panko.*$
         - tripleo-ci-centos-7-scenario002-multinode-oooq-container:
             files:
               - ^manifests/haproxy.*$
-              - ^manifests/profile/base/aodh.*$
-              - ^manifests/profile/base/barbican.*$
-              - ^manifests/profile/base/ceilometer.*$
-              - ^manifests/profile/base/cinder.*$
-              - ^manifests/profile/base/glance.*$
-              - ^manifests/profile/base/gnocchi.*$
-              - ^manifests/profile/base/nova/ec2.*$
-              - ^manifests/profile/base/panko.*$
-              - ^manifests/profile/base/swift.*$
-              - ^manifests/profile/base/zaqar.*$
+              - ^manifests/profile/(base|pacemaker)/aodh.*$
+              - ^manifests/profile/(base|pacemaker)/barbican.*$
+              - ^manifests/profile/(base|pacemaker)/ceilometer.*$
+              - ^manifests/profile/(base|pacemaker)/cinder.*$
+              - ^manifests/profile/(base|pacemaker)/glance.*$
+              - ^manifests/profile/(base|pacemaker)/gnocchi.*$
+              - ^manifests/profile/(base|pacemaker)/nova/ec2.*$
+              - ^manifests/profile/(base|pacemaker)/panko.*$
+              - ^manifests/profile/(base|pacemaker)/swift.*$
+              - ^manifests/profile/(base|pacemaker)/zaqar.*$
         - tripleo-ci-centos-7-scenario003-multinode-oooq-container:
             files:
               - ^manifests/haproxy.*$
-              - ^manifests/profile/base/glance.*$
-              - ^manifests/profile/base/mistral.*$
-              - ^manifests/profile/base/sahara.*$
+              - ^manifests/profile/(base|pacemaker)/glance.*$
+              - ^manifests/profile/(base|pacemaker)/mistral.*$
+              - ^manifests/profile/(base|pacemaker)/sahara.*$
         - tripleo-ci-centos-7-scenario004-multinode-oooq-container:
             files:
               - ^manifests/haproxy.*$
-              - ^manifests/profile/base/ceph.*$
-              - ^manifests/profile/base/glance.*$
-              - ^manifests/profile/base/manila.*$
-              - ^manifests/profile/pacemaker/manila.*$
+              - ^manifests/profile/(base|pacemaker)/ceph.*$
+              - ^manifests/profile/(base|pacemaker)/glance.*$
+              - ^manifests/profile/(base|pacemaker)/manila.*$
         - tripleo-ci-centos-7-scenario007-multinode-oooq-container:
             files:
               - ^manifests/profile/pacemaker/ovn.*$
-              - ^manifests/profile/base/neutron/plugins/ml2/ovn.*$
-              - ^manifests/profile/base/neutron/agents/ovn.*$
-              - ^manifests/profile/base/neutron/ovn.*$
-              - ^manifests/profile/base/congress.*$
-              - ^manifests/profile/base/tacker.*$
+              - ^manifests/profile/(base|pacemaker)/neutron/plugins/ml2/ovn.*$
+              - ^manifests/profile/(base|pacemaker)/neutron/agents/ovn.*$
+              - ^manifests/profile/(base|pacemaker)/neutron/ovn.*$
+              - ^manifests/profile/(base|pacemaker)/congress.*$
+              - ^manifests/profile/(base|pacemaker)/tacker.*$
     experimental:
       jobs:
         - tripleo-ci-centos-7-scenario005-multinode-oooq:
@@ -114,10 +112,10 @@
               - ^manifests/haproxy.*$
               - ^manifests/pacemaker/.*$
               - ^manifests/profile/pacemaker.*$
-              - manifests/profile/base/pacemaker.pp
+              - manifests/profile/(base|pacemaker)/pacemaker.pp
         - tripleo-ci-centos-7-scenario008-multinode-oooq:
             files:
-              - manifests/profile/base/neutron/opendaylight.pp
-              - manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
-              - manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
-              - ^manifests/profile/base/neutron/opendaylight/.*$
+              - manifests/profile/(base|pacemaker)/neutron/opendaylight.pp
+              - manifests/profile/(base|pacemaker)/neutron/plugins/ml2/opendaylight.pp
+              - manifests/profile/(base|pacemaker)/neutron/plugins/ovs/opendaylight.pp
+              - ^manifests/profile/(base|pacemaker)/neutron/opendaylight/.*$