diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index fa88c05217..c9770d45ae 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -43,7 +43,6 @@
               - ^(docker|puppet)/services/.*zaqar.*$
               - ci/environments/scenario002-multinode-containers.yaml
               - ^environments\/.*.yaml
-            voting: false
         - tripleo-ci-centos-7-scenario003-multinode-oooq-container:
             files:
               - ^(docker|puppet)/services/.*glance.*$
@@ -89,6 +88,20 @@
               - ^(docker|puppet)/services/.*panko.*$
               - ci/environments/scenario001-multinode-containers.yaml
               - ^environments\/.*.yaml
+        - tripleo-ci-centos-7-scenario002-multinode-oooq-container:
+            files:
+              - ^(docker|puppet)/services/.*aodh.*$
+              - ^(docker|puppet)/services/.*barbican.*$
+              - ^(docker|puppet)/services/.*ceilometer.*$
+              - ^(docker|puppet)/services/.*cinder.*$
+              - ^(docker|puppet)/services/.*ec2-api.*$
+              - ^(docker|puppet)/services/.*glance.*$
+              - ^(docker|puppet)/services/.*gnocchi.*$
+              - ^(docker|puppet)/services/.*panko.*$
+              - ^(docker|puppet)/services/.*swift.*$
+              - ^(docker|puppet)/services/.*zaqar.*$
+              - ci/environments/scenario002-multinode-containers.yaml
+              - ^environments\/.*.yaml
         - tripleo-ci-centos-7-scenario003-multinode-oooq-container:
             files:
               - ^(docker|puppet)/services/.*glance.*$