diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index bd84ad117c..391fc31fd7 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -50,7 +50,7 @@
               - ^network/endpoints/.*$
               - ^common/.*$
               - zuul.d/*
-        - tripleo-ci-centos-7-scenario002-multinode-oooq-container:
+        - tripleo-ci-centos-7-scenario002-standalone:
             files:
               - ^(docker|puppet)/services/.*aodh.*$
               - ^(docker|puppet)/services/.*barbican.*$
@@ -62,7 +62,7 @@
               - ^(docker|puppet)/services/.*panko.*$
               - ^(docker|puppet)/services/.*swift.*$
               - ^(docker|puppet)/services/.*zaqar.*$
-              - ci/environments/scenario002-multinode-containers.yaml
+              - ci/environments/scenario002-standalone.yaml
               - ^environments\/.*.yaml
               - ^deployed-server/.*$
               - ^network/endpoints/.*$