diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 804fd8a6e6..2843a8e43d 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -15,23 +15,6 @@
     check:
       jobs:
         - tripleo-ci-centos-7-3nodes-multinode
-        - tripleo-ci-centos-7-scenario001-multinode-oooq:
-            files:
-              - ^puppet/services/aodh.*$
-              - ^puppet/services/ceilometer.*$
-              - ^puppet/services/ceph.*$
-              - ^puppet/services/cinder.*$
-              - ^puppet/services/congress.*$
-              - ^puppet/services/glance.*$
-              - ^puppet/services/gnocchi.*$
-              - ^puppet/services/logging.*$
-              - ^puppet/services/metrics.*$
-              - ^puppet/services/monitoring.*$
-              - ^puppet/services/panko.*$
-              - ^puppet/services/tacker.*$
-              - ci/environments/scenario001-multinode.yaml
-              - ci/pingtests/scenario001.*$
-              - ^environments\/.*.yaml
         - tripleo-ci-centos-7-scenario001-multinode-oooq-container:
             voting: false
             files:
@@ -48,21 +31,6 @@
               - ci/environments/scenario001-multinode-containers.yaml
               - ci/pingtests/scenario001.*$
               - ^environments\/.*.yaml
-        - tripleo-ci-centos-7-scenario002-multinode-oooq:
-            files:
-              - ^puppet/services/aodh.*$
-              - ^puppet/services/barbican.*$
-              - ^puppet/services/ceilometer.*$
-              - ^puppet/services/cinder.*$
-              - ^puppet/services/ec2-api.*$
-              - ^puppet/services/glance.*$
-              - ^puppet/services/gnocchi.*$
-              - ^puppet/services/panko.*$
-              - ^puppet/services/swift.*$
-              - ^puppet/services/zaqar.*$
-              - ci/environments/scenario002-multinode.yaml
-              - ci/pingtests/scenario002.*$
-              - ^environments\/.*.yaml
         - tripleo-ci-centos-7-scenario002-multinode-oooq-container:
             voting: false
             files:
@@ -79,14 +47,6 @@
               - ci/environments/scenario002-multinode-containers.yaml
               - ci/pingtests/scenario002.*$
               - ^environments\/.*.yaml
-        - tripleo-ci-centos-7-scenario003-multinode-oooq:
-            files:
-              - ^puppet/services/glance.*$
-              - ^puppet/services/mistral.*$
-              - ^puppet/services/sahara.*$
-              - ci/environments/scenario003-multinode.yaml
-              - ci/pingtests/scenario003.*$
-              - ^environments\/.*.yaml
         - tripleo-ci-centos-7-scenario003-multinode-oooq-container:
             voting: false
             files:
@@ -96,14 +56,6 @@
               - ci/environments/scenario003-multinode-containers.yaml
               - ci/pingtests/scenario003.*$
               - ^environments\/.*.yaml
-        - tripleo-ci-centos-7-scenario004-multinode-oooq:
-            files:
-              - ^puppet/services/ceph.*$
-              - ^puppet/services/glance.*$
-              - ^puppet/services/manila.*$
-              - ci/environments/scenario004-multinode.yaml
-              - ci/pingtests/scenario004.*$
-              - ^environments\/.*.yaml
         - tripleo-ci-centos-7-scenario004-multinode-oooq-container:
             files:
               - ^docker/services/ceph.*$
@@ -119,12 +71,6 @@
               - ^extraconfig/services/kubernetes.*$
               - ci/environments/scenario006-multinode.yaml
               - ci/pingtests/scenario006-multinode.yaml
-        - tripleo-ci-centos-7-scenario007-multinode-oooq:
-            files:
-              - ci/environments/scenario007-multinode.yaml
-              - ci/pingtests/scenario007-multinode.yaml
-              - ^puppet/services/.*ovn.*$
-              - config/general_config/featureset028.yml
         - tripleo-ci-centos-7-scenario007-multinode-oooq-container:
             files:
               - ci/environments/scenario007-multinode-containers.yaml
@@ -136,54 +82,6 @@
     gate:
       queue: tripleo
       jobs:
-        - tripleo-ci-centos-7-scenario001-multinode-oooq:
-            files:
-              - ^puppet/services/aodh.*$
-              - ^puppet/services/ceilometer.*$
-              - ^puppet/services/ceph.*$
-              - ^puppet/services/cinder.*$
-              - ^puppet/services/congress.*$
-              - ^puppet/services/glance.*$
-              - ^puppet/services/gnocchi.*$
-              - ^puppet/services/logging.*$
-              - ^puppet/services/metrics.*$
-              - ^puppet/services/monitoring.*$
-              - ^puppet/services/panko.*$
-              - ^puppet/services/tacker.*$
-              - ci/environments/scenario001-multinode.yaml
-              - ci/pingtests/scenario001.*$
-              - ^environments\/.*.yaml
-        - tripleo-ci-centos-7-scenario002-multinode-oooq:
-            files:
-              - ^puppet/services/aodh.*$
-              - ^puppet/services/barbican.*$
-              - ^puppet/services/ceilometer.*$
-              - ^puppet/services/cinder.*$
-              - ^puppet/services/ec2-api.*$
-              - ^puppet/services/glance.*$
-              - ^puppet/services/gnocchi.*$
-              - ^puppet/services/panko.*$
-              - ^puppet/services/swift.*$
-              - ^puppet/services/zaqar.*$
-              - ci/environments/scenario002-multinode.yaml
-              - ci/pingtests/scenario002.*$
-              - ^environments\/.*.yaml
-        - tripleo-ci-centos-7-scenario003-multinode-oooq:
-            files:
-              - ^puppet/services/glance.*$
-              - ^puppet/services/mistral.*$
-              - ^puppet/services/sahara.*$
-              - ci/environments/scenario003-multinode.yaml
-              - ci/pingtests/scenario003.*$
-              - ^environments\/.*.yaml
-        - tripleo-ci-centos-7-scenario004-multinode-oooq:
-            files:
-              - ^puppet/services/ceph.*$
-              - ^puppet/services/glance.*$
-              - ^puppet/services/manila.*$
-              - ci/environments/scenario004-multinode.yaml
-              - ci/pingtests/scenario004.*$
-              - ^environments\/.*.yaml
         - tripleo-ci-centos-7-scenario004-multinode-oooq-container:
             files:
               - ^(docker|puppet)/services/ceph.*$
@@ -192,12 +90,6 @@
               - ci/environments/scenario004-multinode-containers.yaml
               - ci/pingtests/scenario004.*$
               - ^environments\/.*.yaml
-        - tripleo-ci-centos-7-scenario007-multinode-oooq:
-            files:
-              - ci/environments/scenario007-multinode.yaml
-              - ci/pingtests/scenario007-multinode.yaml
-              - ^puppet/services/.*ovn.*$
-              - config/general_config/featureset028.yml
         - tripleo-ci-centos-7-scenario007-multinode-oooq-container:
             files:
               - ci/environments/scenario007-multinode-containers.yaml