diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 45feb3a22c..beee7ef74e 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -15,18 +15,18 @@
         - tripleo-ci-centos-7-containers-multinode:
             dependencies: &deps_unit_lint
               - openstack-tox-pep8
-        - tripleo-ci-centos-7-undercloud-containers:
+        - tripleo-ci-centos-8-containers-multinode:
             dependencies: *deps_unit_lint
-        - tripleo-ci-centos-7-standalone:
+        - tripleo-ci-centos-8-undercloud-containers:
             dependencies: *deps_unit_lint
-        - tripleo-ci-centos-7-standalone-upgrade-stein:
+        - tripleo-ci-centos-8-standalone:
             dependencies: *deps_unit_lint
         - tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades:
             voting: true
             dependencies: *deps_unit_lint
         - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates:
             dependencies: *deps_unit_lint
-            files:
+            files: &multinode_updates_files
               - common/.*$
               - ci/environments/scenario000-multinode-containers.yaml
               - ^ci/common/.*$
@@ -51,7 +51,10 @@
               - ^environments\/.*.yaml
               - ^network/endpoints/.*$
               - zuul.d/*
-        - tripleo-ci-centos-7-scenario007-multinode-oooq-container:
+        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-train:
+            dependencies: *deps_unit_lint
+            files: *multinode_updates_files
+        - tripleo-ci-centos-8-scenario007-multinode-oooq-container:
             dependencies: *deps_unit_lint
             files:
               - ci/environments/scenario007-multinode-containers.yaml
@@ -63,13 +66,13 @@
               - ^deployed-server/.*$
               - ^common/.*$
               - zuul.d/*
-        - tripleo-ci-centos-7-scenario010-multinode-oooq-container:
+        - tripleo-ci-centos-8-scenario010-standalone:
             dependencies: *deps_unit_lint
             files:
               - ^(deployment|docker|puppet)/.*octavia.*$
               - ^deployment/ceph-ansible.*$
               - ^deployment/octavia/*$
-              - ci/environments/scenario010-multinode-containers.yaml
+              - ci/environments/scenario010-standalone.yaml
               - ^ci/common/.*$
               - ^environments\/.*.yaml
               - ^deployed-server/.*$
@@ -78,15 +81,15 @@
               - zuul.d/*
         - tripleo-ci-centos-7-standalone-upgrade:
             dependencies: *deps_unit_lint
-        - tripleo-ci-centos-7-scenario001-standalone:
+        - tripleo-ci-centos-8-scenario001-standalone:
             dependencies: *deps_unit_lint
-        - tripleo-ci-centos-7-scenario002-standalone:
+        - tripleo-ci-centos-8-scenario002-standalone:
             dependencies: *deps_unit_lint
-        - tripleo-ci-centos-7-scenario003-standalone:
+        - tripleo-ci-centos-8-scenario003-standalone:
             dependencies: *deps_unit_lint
-        - tripleo-ci-centos-7-scenario004-standalone:
+        - tripleo-ci-centos-8-scenario004-standalone:
             dependencies: *deps_unit_lint
-        - tripleo-ci-centos-7-scenario012-standalone:
+        - tripleo-ci-centos-8-scenario012-standalone:
             dependencies: *deps_unit_lint
         - tripleo-ci-centos-7-containerized-undercloud-upgrades:
             voting: false
@@ -98,47 +101,4 @@
         - openstack-tox-pep8
         - tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades
         - 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.*$
-        - tripleo-ci-centos-7-scenario006-multinode-oooq-container:
-            dependencies: *deps_unit_lint
-            files:
-              - ^ci/common/.*$
-              - ^coe/kubernetes.*$
-              - ^environments/kubernetes.*$
-              - ^deployment/.*kubernetes/.*$
-              - ci/environments/scenario006-multinode.yaml
-              - ^deployed-server/.*$
-              - ^common/.*$
-              - zuul.d/*
+            files: *multinode_updates_files