diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 4c4eae1bf9..0560f37c5d 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -22,22 +22,22 @@
               - ci/environments/scenario000-multinode-containers.yaml
               - ^deployed-server/.*$
               - ^deployment/container-image-prepare/.*$
-              - ^(docker|puppet)/services/.*ca-certs.*$
-              - ^(docker|puppet)/services/.*clustercheck.*$
-              - ^(docker|puppet)/services/.*docker.*$
-              - ^(docker|puppet)/services/.*haproxy.*$
-              - ^(docker|puppet)/services/.*kernel.*$
-              - ^(docker|puppet)/services/.*keystone.*$
-              - ^(docker|puppet)/services/.*memcached.*$
-              - ^(docker|puppet)/services/.*mysql.*$
-              - ^(docker|puppet)/services/.*ntp.*$
-              - ^(docker|puppet)/services/.*pacemaker.*$
-              - ^(docker|puppet)/services/.*rabbitmq.*$
-              - ^(docker|puppet)/services/.*snmp.*$
-              - ^(docker|puppet)/services/.*timezone.*$
-              - ^(docker|puppet)/services/.*tripleo-packages.*$
-              - ^(docker|puppet)/services/.*tripleo-firewall.*$
-              - ^(docker|puppet)/services/.*sshd.*$
+              - ^(deployment|docker|puppet)/.*ca-certs.*$
+              - ^(deployment|docker|puppet)/.*clustercheck.*$
+              - ^(deployment|docker|puppet)/.*docker.*$
+              - ^(deployment|docker|puppet)/.*haproxy.*$
+              - ^(deployment|docker|puppet)/.*kernel.*$
+              - ^(deployment|docker|puppet)/.*keystone.*$
+              - ^(deployment|docker|puppet)/.*memcached.*$
+              - ^(deployment|docker|puppet)/.*mysql.*$
+              - ^(deployment|docker|puppet)/.*ntp.*$
+              - ^(deployment|docker|puppet)/.*pacemaker.*$
+              - ^(deployment|docker|puppet)/.*rabbitmq.*$
+              - ^(deployment|docker|puppet)/.*snmp.*$
+              - ^(deployment|docker|puppet)/.*timezone.*$
+              - ^(deployment|docker|puppet)/.*tripleo-packages.*$
+              - ^(deployment|docker|puppet)/.*tripleo-firewall.*$
+              - ^(deployment|docker|puppet)/.*sshd.*$
               - ^environments\/.*.yaml
               - ^network/endpoints/.*$
               - zuul.d/*
@@ -56,9 +56,9 @@
             dependencies: *deps_unit_lint
             files:
               - ci/environments/scenario007-multinode-containers.yaml
-              - ^(docker|puppet)/services/neutron-plugin-ml2.yaml #LP1765975
-              - ^(docker|puppet)/services/.*.*ovn.*$
-              - ^(docker|puppet)/services/.*tacker.*$
+              - ^(deployment|docker|puppet)/neutron-plugin-ml2.yaml #LP1765975
+              - ^(deployment|docker|puppet)/.*.*ovn.*$
+              - ^(deployment|docker|puppet)/.*tacker.*$
               - ^environments\/.*.yaml
               - ^deployed-server/.*$
               - ^common/.*$
@@ -67,8 +67,8 @@
             dependencies: *deps_unit_lint
             files:
               - ci/environments/scenario008-multinode-containers.yaml
-              - ^(docker|puppet)/services/(odl|opendaylight).*$
-              - ^(docker|puppet)/services/neutron-plugin-ml2.yaml #LP1765975
+              - ^(deployment|docker|puppet)/(odl|opendaylight).*$
+              - ^(deployment|docker|puppet)/neutron-plugin-ml2.yaml #LP1765975
               - ^environments\/.*.yaml
               - ^deployed-server/.*$
               - ^common/.*$
@@ -79,9 +79,9 @@
               - ^coe/openshift.*$
               - ^environments/openshift.*$
               - ^extraconfig/services/openshift.*$
-              - ^(docker|puppet)/services/.*haproxy.*$
-              - ^(docker|puppet)/services/.*keepalived.*$
-              - ^(docker|puppet)/services/.*mistral.*$
+              - ^(deployment|docker|puppet)/.*haproxy.*$
+              - ^(deployment|docker|puppet)/.*keepalived.*$
+              - ^(deployment|docker|puppet)/.*mistral.*$
               - ci/environments/scenario009-multinode.yaml
               - ci/pingtests/scenario009-multinode.yaml
               - ^network/endpoints/.*$
@@ -91,7 +91,7 @@
         - tripleo-ci-centos-7-scenario010-multinode-oooq-container:
             dependencies: *deps_unit_lint
             files:
-              - ^(docker|puppet)/services/.*octavia.*$
+              - ^(deployment|docker|puppet)/.*octavia.*$
               - ^deployment/ceph-ansible.*$
               - ci/environments/scenario010-multinode-containers.yaml
               - ^environments\/.*.yaml
@@ -123,22 +123,22 @@
               - ci/environments/scenario000-multinode-containers.yaml
               - ^deployed-server/.*$
               - ^deployment/container-image-prepare/.*$
-              - ^(docker|puppet)/services/.*ca-certs.*$
-              - ^(docker|puppet)/services/.*clustercheck.*$
-              - ^(docker|puppet)/services/.*docker.*$
-              - ^(docker|puppet)/services/.*haproxy.*$
-              - ^(docker|puppet)/services/.*kernel.*$
-              - ^(docker|puppet)/services/.*keystone.*$
-              - ^(docker|puppet)/services/.*memcached.*$
-              - ^(docker|puppet)/services/.*mysql.*$
-              - ^(docker|puppet)/services/.*ntp.*$
-              - ^(docker|puppet)/services/.*pacemaker.*$
-              - ^(docker|puppet)/services/.*rabbitmq.*$
-              - ^(docker|puppet)/services/.*snmp.*$
-              - ^(docker|puppet)/services/.*timezone.*$
-              - ^(docker|puppet)/services/.*tripleo-packages.*$
-              - ^(docker|puppet)/services/.*tripleo-firewall.*$
-              - ^(docker|puppet)/services/.*sshd.*$
+              - ^(deployment|docker|puppet)/.*ca-certs.*$
+              - ^(deployment|docker|puppet)/.*clustercheck.*$
+              - ^(deployment|docker|puppet)/.*docker.*$
+              - ^(deployment|docker|puppet)/.*haproxy.*$
+              - ^(deployment|docker|puppet)/.*kernel.*$
+              - ^(deployment|docker|puppet)/.*keystone.*$
+              - ^(deployment|docker|puppet)/.*memcached.*$
+              - ^(deployment|docker|puppet)/.*mysql.*$
+              - ^(deployment|docker|puppet)/.*ntp.*$
+              - ^(deployment|docker|puppet)/.*pacemaker.*$
+              - ^(deployment|docker|puppet)/.*rabbitmq.*$
+              - ^(deployment|docker|puppet)/.*snmp.*$
+              - ^(deployment|docker|puppet)/.*timezone.*$
+              - ^(deployment|docker|puppet)/.*tripleo-packages.*$
+              - ^(deployment|docker|puppet)/.*tripleo-firewall.*$
+              - ^(deployment|docker|puppet)/.*sshd.*$
               - ^environments\/.*.yaml
               - ^network/endpoints/.*$
               - zuul.d/*
@@ -147,5 +147,5 @@
         - tripleo-ci-centos-7-scenario011-multinode-oooq-container:
             files:
               - ci/environments/scenario011-multinode-containers.yaml
-              - ^(docker|puppet)/services/.*ironic.*$
+              - ^(deployment|docker|puppet)/.*ironic.*$
               - ^environments\/.*ironic.*$