diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index ac9236de57..c784ac6cbe 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -17,31 +17,6 @@
               - openstack-tox-pep8
         - tripleo-ci-centos-8-content-provider:
             dependencies: *deps_unit_lint
-        - tripleo-ci-centos-7-containers-multinode:
-            vars: &multi_consumer_vars
-              consumer_job: true
-              build_container_images: false
-              remove_tags:
-                - build
-            dependencies: &deps_cprovider_c7
-              - tripleo-ci-centos-7-content-provider
-        - tripleo-ci-centos-8-containers-multinode:
-            vars: *multi_consumer_vars
-            dependencies: &deps_cprovider
-              - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-undercloud-containers:
-            vars: &undercloud_consumer_vars
-              consumer_job: true
-              remove_tags:
-                - build
-            dependencies: *deps_cprovider
-        - tripleo-ci-centos-8-standalone:
-            vars: &sa_consumer_vars
-              consumer_job: true
-              build_container_images: false
-              tags:
-                - standalone
-            dependencies: *deps_cprovider
         - tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades:
             voting: true
             dependencies: *deps_unit_lint
@@ -73,8 +48,13 @@
               - ^network/endpoints/.*$
               - zuul.d/*
         - tripleo-ci-centos-8-scenario007-multinode-oooq-container:
-            vars: *multi_consumer_vars
-            dependencies: *deps_cprovider
+            vars: &multi_consumer_vars
+              consumer_job: true
+              build_container_images: false
+              remove_tags:
+                - build
+            dependencies: &deps_cprovider
+              - tripleo-ci-centos-8-content-provider
             files:
               - ci/environments/scenario007-multinode-containers.yaml
               - ^(deployment|docker|puppet)/neutron-plugin-ml2.yaml #LP1765975
@@ -99,21 +79,6 @@
               - ^network/endpoints/.*$
               - ^common/.*$
               - zuul.d/*
-        - tripleo-ci-centos-8-scenario001-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *deps_cprovider
-        - tripleo-ci-centos-8-scenario002-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *deps_cprovider
-        - tripleo-ci-centos-8-scenario003-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *deps_cprovider
-        - tripleo-ci-centos-8-scenario004-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *deps_cprovider
-        - tripleo-ci-centos-8-scenario012-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *deps_cprovider
         - tripleo-ci-centos-7-containerized-undercloud-upgrades:
             voting: false
             dependencies: *deps_unit_lint