diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index a578820f..d8be7e5c 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -5,117 +5,16 @@
       - openstack-tox-molecule
     check:
       jobs:
-        - tripleo-ci-centos-8-content-provider-victoria:
-            dependencies:
-              - tripleo-upgrade-centos-8-molecule
-        - tripleo-ci-centos-8-content-provider-ussuri:
-            dependencies:
-              - tripleo-upgrade-centos-8-molecule
         - openstack-tox-linters
         - tripleo-tox-molecule
         - tripleo-upgrade-centos-8-molecule:
             dependencies:
               - tripleo-tox-molecule
-        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-victoria:
-            irrelevant-files: &multinode_ignored
-              - ^.*\.md$
-              - ^.*\.rst$
-              - ^.pre-commit-config.yaml$
-              - ^doc/.*$
-              - ^docs/.*$
-              - ^etc/.*$
-              - ^metadata.json$
-              - ^releasenotes/.*$
-              - ^test-requirements.txt$
-              - ^setup.*$
-              - ^spec/.*$
-              - ^Puppetfile.*$
-              - tox.ini
-              - ^roles/build-containers/.*$
-              - ^roles/oooci-build-images/.*$
-              - ^playbooks/deprecated/.*$
-              - ^playbooks/tripleo-buildcontainers/.*$
-              - ^playbooks/tripleo-buildimages/.*$
-              - ^vars/sova-patterns.yml$
-              - zuul.d/layout.yaml
-              - zuul.d/build-containers.yaml
-              - zuul.d/build-image.yaml
-              - zuul.d/standalone-jobs.yaml
-              - zuul.d/undercloud-jobs.yaml
-              # tripleo-quickstart-extras
-              - playbooks/quickstart-extras-standalone.yml
-              - roles/standalone/.*
-              - roles/standalone-upgrade/.*
-            vars: &multi_consumer_vars
-              consumer_job: true
-              build_container_images: false
-              remove_tags:
-                - build
-            dependencies:
-              - tripleo-ci-centos-8-content-provider-victoria
-        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-victoria:
-            irrelevant-files: *multinode_ignored
-            vars: *multi_consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider-victoria
-        - tripleo-ci-centos-8-undercloud-upgrade-victoria:
-            vars: &undercloud_consumer_vars
-              consumer_job: true
-              remove_tags:
-                - build
-            irrelevant-files: &undercloud_ignored
-              - ^.*\.md$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^docs/.*$
-              - ^etc/.*$
-              - ^metadata.json$
-              - ^releasenotes/.*$
-              - ^test-requirements.txt$
-              - ^spec/.*$
-              - ^Puppetfile.*$
-              - tox.ini
-              - ^roles/build-containers/.*$
-              - ^roles/oooci-build-images/.*$
-              - ^playbooks/deprecated/.*$
-              - ^playbooks/tripleo-buildcontainers/.*$
-              - ^playbooks/tripleo-buildimages/.*$
-              - ^vars/sova-patterns.yml$
-              - zuul.d/layout.yaml
-              - zuul.d/build-containers.yaml
-              - zuul.d/build-image.yaml
-              - zuul.d/standalone-jobs.yaml
-              - zuul.d/multinode-jobs.yaml
-            dependencies:
-              - tripleo-ci-centos-8-content-provider-victoria
-              - tripleo-ci-centos-8-content-provider-ussuri
     gate:
       queue: tripleo
       jobs:
-        - tripleo-ci-centos-8-content-provider-victoria:
-            dependencies:
-              - tripleo-upgrade-centos-8-molecule
-        - tripleo-ci-centos-8-content-provider-ussuri:
-            dependencies:
-              - tripleo-upgrade-centos-8-molecule
         - openstack-tox-linters
         - tripleo-upgrade-centos-8-molecule
-        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-victoria:
-            irrelevant-files: *multinode_ignored
-            vars: *multi_consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider-victoria
-        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-victoria:
-            irrelevant-files: *multinode_ignored
-            vars: *multi_consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider-victoria
-        - tripleo-ci-centos-8-undercloud-upgrade-victoria:
-            vars: *undercloud_consumer_vars
-            irrelevant-files: *undercloud_ignored
-            dependencies:
-              - tripleo-ci-centos-8-content-provider-victoria
-              - tripleo-ci-centos-8-content-provider-ussuri
     post:
       jobs:
         - publish-openstack-python-branch-tarball