diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 2843a8e43d..85c1a84c96 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -16,7 +16,6 @@
       jobs:
         - tripleo-ci-centos-7-3nodes-multinode
         - tripleo-ci-centos-7-scenario001-multinode-oooq-container:
-            voting: false
             files:
               - ^(docker|puppet)/services/aodh.*$
               - ^(docker|puppet)/services/ceilometer.*$
@@ -32,7 +31,6 @@
               - ci/pingtests/scenario001.*$
               - ^environments\/.*.yaml
         - tripleo-ci-centos-7-scenario002-multinode-oooq-container:
-            voting: false
             files:
               - ^(docker|puppet)/services/aodh.*$
               - ^(docker|puppet)/services/barbican.*$
@@ -47,8 +45,8 @@
               - ci/environments/scenario002-multinode-containers.yaml
               - ci/pingtests/scenario002.*$
               - ^environments\/.*.yaml
-        - tripleo-ci-centos-7-scenario003-multinode-oooq-container:
             voting: false
+        - tripleo-ci-centos-7-scenario003-multinode-oooq-container:
             files:
               - ^(docker|puppet)/services/glance.*$
               - ^(docker|puppet)/services/mistral.*$
@@ -82,6 +80,29 @@
     gate:
       queue: tripleo
       jobs:
+        - tripleo-ci-centos-7-scenario001-multinode-oooq-container:
+            files:
+              - ^(docker|puppet)/services/aodh.*$
+              - ^(docker|puppet)/services/ceilometer.*$
+              - ^(docker|puppet)/services/ceph.*$
+              - ^(docker|puppet)/services/cinder.*$
+              - ^(docker|puppet)/services/glance.*$
+              - ^(docker|puppet)/services/gnocchi.*$
+              - ^(docker|puppet)/services/logging.*$
+              - ^(docker|puppet)/services/metrics.*$
+              - ^(docker|puppet)/services/monitoring.*$
+              - ^(docker|puppet)/services/panko.*$
+              - ci/environments/scenario001-multinode-containers.yaml
+              - ci/pingtests/scenario001.*$
+              - ^environments\/.*.yaml
+        - tripleo-ci-centos-7-scenario003-multinode-oooq-container:
+            files:
+              - ^(docker|puppet)/services/glance.*$
+              - ^(docker|puppet)/services/mistral.*$
+              - ^(docker|puppet)/services/sahara.*$
+              - ci/environments/scenario003-multinode-containers.yaml
+              - ci/pingtests/scenario003.*$
+              - ^environments\/.*.yaml
         - tripleo-ci-centos-7-scenario004-multinode-oooq-container:
             files:
               - ^(docker|puppet)/services/ceph.*$