diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 65f5d3c1bc..7c1dbbe3cd 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -1,22 +1,15 @@
 - project:
     templates:
-      - tripleo-undercloud-jobs
-      - tripleo-multinode-container-minimal
       - check-requirements
       - release-notes-jobs-python3
-      - openstack-python-jobs
-      - openstack-python36-jobs
-      - tripleo-standalone-scenarios-full
-      - openstack-python37-jobs
+      - tripleo-multinode-container-minimal
     check:
       jobs:
         - openstack-tox-pep8
         - openstack-tox-lower-constraints
-        - tripleo-ci-centos-7-containers-multinode:
+        - tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades:
             dependencies: &deps_unit_lint
               - openstack-tox-pep8
-        - tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades:
-            dependencies: *deps_unit_lint
         - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates:
             dependencies: *deps_unit_lint
             files:
@@ -44,93 +37,14 @@
               - ^environments\/.*.yaml
               - ^network/endpoints/.*$
               - zuul.d/*
-        - tripleo-ci-centos-7-scenario006-multinode-oooq-container:
-            dependencies: *deps_unit_lint
-            files:
-              - ^ci/common/.*$
-              - ^coe/kubernetes.*$
-              - ^environments/kubernetes.*$
-              - ^extraconfig/services/kubernetes.*$
-              - ci/environments/scenario006-multinode.yaml
-              - ci/pingtests/scenario006-multinode.yaml
-              - ^deployed-server/.*$
-              - ^common/.*$
-              - zuul.d/*
-        - tripleo-ci-centos-7-scenario007-multinode-oooq-container:
-            dependencies: *deps_unit_lint
-            files:
-              - ci/environments/scenario007-multinode-containers.yaml
-              - ^(deployment|docker|puppet)/neutron-plugin-ml2.yaml #LP1765975
-              - ^(deployment|docker|puppet)/.*.*ovn.*$
-              - ^(deployment|docker|puppet)/.*tacker.*$
-              - ^ci/common/.*$
-              - ^environments\/.*.yaml
-              - ^deployed-server/.*$
-              - ^common/.*$
-              - zuul.d/*
-        - tripleo-ci-centos-7-scenario010-multinode-oooq-container:
-            dependencies: *deps_unit_lint
-            files:
-              - ^(deployment|docker|puppet)/.*octavia.*$
-              - ^deployment/ceph-ansible.*$
-              - ^deployment/octavia/*$
-              - ci/environments/scenario010-multinode-containers.yaml
-              - ^ci/common/.*$
-              - ^environments\/.*.yaml
-              - ^deployed-server/.*$
-              - ^network/endpoints/.*$
-              - ^common/.*$
-              - zuul.d/*
-        - tripleo-ci-centos-7-scenario001-standalone:
-            dependencies: *deps_unit_lint
-        - tripleo-ci-centos-7-scenario002-standalone:
-            dependencies: *deps_unit_lint
-        - tripleo-ci-centos-7-scenario003-standalone:
-            dependencies: *deps_unit_lint
-        - tripleo-ci-centos-7-scenario004-standalone:
-            dependencies: *deps_unit_lint
-        - tripleo-ci-centos-7-scenario012-standalone:
-            dependencies: *deps_unit_lint
-        - tripleo-ci-centos-7-containerized-undercloud-upgrades:
+        - tripleo-ci-centos-7-standalone:
             dependencies: *deps_unit_lint
     gate:
       queue: tripleo
       jobs:
         - openstack-tox-lower-constraints
         - openstack-tox-pep8
-        - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates:
-            files:
-              - common/.*$
-              - ci/environments/scenario000-multinode-containers.yaml
-              - ^ci/common/.*$
-              - ^deployed-server/.*$
-              - ^deployment/container-image-prepare/.*$
-              - ^(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/*
-    experimental:
-      jobs:
-        - tripleo-ci-centos-7-scenario011-multinode-oooq-container:
-            files:
-              - ci/environments/scenario011-multinode-containers.yaml
-              - ^(deployment|docker|puppet)/.*ironic.*$
-              - ^environments\/.*ironic.*$
-    periodic:
-      jobs:
-        - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates
+        - tripleo-ci-centos-7-standalone:
+             dependencies: *deps_unit_lint
+        - tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades:
+            dependencies: *deps_unit_lint