diff --git a/zuul.d/build-containers.yaml b/zuul.d/build-containers.yaml
index 2a8c0b534..b49d2dc39 100644
--- a/zuul.d/build-containers.yaml
+++ b/zuul.d/build-containers.yaml
@@ -6,9 +6,7 @@
     name: tripleo-ci-build-containers-jobs
     check:
       jobs:
-        - tripleo-build-containers-centos-7
         - tripleo-build-containers-centos-7-rocky
-        - tripleo-build-containers-centos-7-buildah
         - tripleo-build-containers-centos-7-buildah-train
         - tripleo-build-containers-centos-7-buildah-stein
         - tripleo-build-containers-centos-8
@@ -16,9 +14,7 @@
     gate:
       queue: tripleo
       jobs:
-        - tripleo-build-containers-centos-7
         - tripleo-build-containers-centos-7-rocky
-        - tripleo-build-containers-centos-7-buildah
         - tripleo-build-containers-centos-7-buildah-stein
         - tripleo-build-containers-centos-7-buildah-train
         - tripleo-build-containers-centos-8
diff --git a/zuul.d/build-image.yaml b/zuul.d/build-image.yaml
index f6be8a0cc..a01fd0d8a 100644
--- a/zuul.d/build-image.yaml
+++ b/zuul.d/build-image.yaml
@@ -2,27 +2,66 @@
 # zuul.d/build-image.yaml
 # Zuul layout for TripleO Build Image jobs.
 
+- project-template:
+    name: tripleo-ci-buildimage-jobs
+    check:
+      jobs:
+        - tripleo-buildimage-overcloud-full-centos-7-train:
+            files: &build_images_files
+              - ^playbooks/tripleo-buildimages/.*$
+              - ^roles/oooci-build-images/.*$
+              - zuul.d/layout.yaml
+              - zuul.d/build-image.yaml
+        - tripleo-buildimage-ironic-python-agent-centos-7-train:
+            files: *build_images_files
+        - tripleo-buildimage-overcloud-full-centos-8:
+            files: *build_images_files
+        - tripleo-buildimage-overcloud-full-centos-8-ussuri:
+            files: *build_images_files
+        - tripleo-buildimage-ironic-python-agent-centos-8:
+            files: *build_images_files
+        - tripleo-buildimage-ironic-python-agent-centos-8-ussuri:
+            files: *build_images_files
+        - tripleo-buildimage-overcloud-hardened-full-centos-8:
+            files: *build_images_files
+        - tripleo-buildimage-overcloud-hardened-full-centos-8-ussuri:
+            files: *build_images_files
+    gate:
+      jobs:
+        - tripleo-buildimage-overcloud-full-centos-7-train:
+            files: *build_images_files
+        - tripleo-buildimage-ironic-python-agent-centos-7-train:
+            files: *build_images_files
+        - tripleo-buildimage-overcloud-full-centos-8:
+            files: *build_images_files
+        - tripleo-buildimage-overcloud-full-centos-8-ussuri:
+            files: *build_images_files
+        - tripleo-buildimage-ironic-python-agent-centos-8:
+            files: *build_images_files
+        - tripleo-buildimage-ironic-python-agent-centos-8-ussuri:
+            files: *build_images_files
+        - tripleo-buildimage-overcloud-hardened-full-centos-8:
+            files: *build_images_files
+        - tripleo-buildimage-overcloud-hardened-full-centos-8-ussuri:
+            files: *build_images_files
+
 - project-template:
     name: tripleo-buildimage-jobs
     check:
       jobs:
         - tripleo-buildimage-overcloud-full-centos-7
-        - tripleo-buildimage-overcloud-full-centos-7-train
         - tripleo-buildimage-overcloud-full-centos-8
-        - tripleo-buildimage-overcloud-full-centos-8-ussuri
+        - tripleo-buildimage-ironic-python-agent-centos-7
         - tripleo-buildimage-ironic-python-agent-centos-8
     gate:
       jobs:
         - tripleo-buildimage-overcloud-full-centos-7
         - tripleo-buildimage-overcloud-full-centos-8
-        - tripleo-buildimage-overcloud-full-centos-7-train
+        - tripleo-buildimage-ironic-python-agent-centos-7
         - tripleo-buildimage-ironic-python-agent-centos-8
-        - tripleo-buildimage-overcloud-full-centos-8-ussuri
     experimental:
       jobs:
-        - tripleo-buildimage-ironic-python-agent-centos-7
         - tripleo-buildimage-overcloud-hardened-full-centos-7
-        - tripleo-buildimage-ironic-python-agent-centos-8
         - tripleo-buildimage-overcloud-hardened-full-centos-8
 
 - project-template:
@@ -67,7 +106,6 @@
     branches: ^(?!stable/(queens|rocky|stein|train)).*$
     vars:
       tripleo_image_type: overcloud-hardened-full
-    voting: false
     irrelevant-files:
       - ^.*\.rst$
       - ^releasenotes/.*$
@@ -102,6 +140,7 @@
 - job:
     name: tripleo-buildimage-overcloud-full-centos-7-train
     parent: tripleo-build-images-base
+    branches: master
     override-checkout: 'stable/train'
     vars:
       tripleo_image_type: overcloud-full
@@ -111,6 +150,19 @@
       - ^.*\.rst$
       - ^releasenotes/.*$
 
+- job:
+    name: tripleo-buildimage-ironic-python-agent-centos-7-train
+    parent: tripleo-build-images-base
+    branches: master
+    override-checkout: 'stable/train'
+    vars:
+      tripleo_image_type: ironic-python-agent
+      tripleo_image_os: centos7
+      branch_override: stable/train
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^releasenotes/.*$
+
 # CentOS 7 Image Build Jobs
 - job:
     name: tripleo-buildimage-ironic-python-agent-centos-7
@@ -119,7 +171,6 @@
     vars:
       tripleo_image_type: ironic-python-agent
       tripleo_image_os: centos7
-    voting: false
     irrelevant-files:
       - ^.*\.rst$
       - ^releasenotes/.*$
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 7b92f4d19..f48a011c2 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -7,6 +7,7 @@
 - project:
     templates:
       - tripleo-ci-build-containers-jobs
+      - tripleo-ci-buildimage-jobs
       - tripleo-multinode-baremetal-full
       - tripleo-multinode-branchful
       - tripleo-multinode-container-full
@@ -36,26 +37,6 @@
               tox_environment:
                 PYTEST_REQPASS: 84
 
-        - tripleo-buildimage-overcloud-full-centos-8:
-            files: &build_images_files
-              - ^playbooks/tripleo-buildimages/.*$
-              - ^roles/oooci-build-images/.*$
-              - zuul.d/layout.yaml
-              - zuul.d/build-image.yaml
-        - tripleo-buildimage-ironic-python-agent-centos-8:
-            files: *build_images_files
-        - tripleo-buildimage-overcloud-hardened-full-centos-8:
-            files: *build_images_files
-        - tripleo-buildimage-overcloud-full-centos-8-ussuri:
-            files: *build_images_files
-        - tripleo-buildimage-overcloud-full-centos-7-train:
-            files: *build_images_files
-        - tripleo-buildimage-overcloud-full-centos-7:
-            files: *build_images_files
-        - tripleo-buildimage-ironic-python-agent-centos-7:
-            files: *build_images_files
-        - tripleo-buildimage-overcloud-hardened-full-centos-7:
-            files: *build_images_files
         - tripleo-ci-centos-7-scenario001-multinode-oooq-container:
             files:
               - ^playbooks/tripleo-ci/.*$
@@ -88,10 +69,6 @@
         - tripleo-tox-molecule
         - openstack-tox-py35:
             files: *py_files
-        - tripleo-buildimage-overcloud-full-centos-7:
-            files: *build_images_files
-        - tripleo-buildimage-overcloud-full-centos-8:
-            files: *build_images_files
         - tripleo-ci-centos-7-standalone-upgrade-train:
             branches: master
         - tripleo-ci-centos-7-standalone-upgrade-stein: