diff --git a/.zuul.yaml b/.zuul.yaml
index 08ee757f..90564c9a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -130,7 +130,7 @@
         - pbr-installation-openstack
         - pbr-installation-openstack-focal
         - pbr-installation-openstack-pip-dev
-        - tempest-full:
+        - tempest-full: &py2-tempest-overrides
             # Default to stable/train as we want to integration test PBR
             # against python2.7 and train is the last 2.7 release.
             override-checkout: stable/train
@@ -143,6 +143,8 @@
                 override-checkout: train-eol
               - name: opendev.org/openstack/nova
                 override-checkout: train-eol
+              - name: opendev.org/openstack/glance
+                override-checkout: train-eol
             vars:
               tox_envlist: smoke
     gate:
@@ -157,37 +159,9 @@
         - pbr-installation-openstack
         - pbr-installation-openstack-focal
         - pbr-installation-openstack-pip-dev
-        - tempest-full:
-            # Default to stable/train as we want to integration test PBR
-            # against python2.7 and train is the last 2.7 release.
-            override-checkout: stable/train
-            # Provide tag specific overrides for projects that have dropped
-            # train.
-            required-projects:
-              - name: opendev.org/openstack/placement
-                override-checkout: train-eol
-              - name: opendev.org/openstack/neutron
-                override-checkout: train-eol
-              - name: opendev.org/openstack/nova
-                override-checkout: train-eol
-            vars:
-              tox_envlist: smoke
+        - tempest-full: *py2-tempest-overrides
     periodic:
       jobs:
         - pbr-installation-openstack
         - pbr-installation-openstack-pip-dev
-        - tempest-full:
-            # Default to stable/train as we want to integration test PBR
-            # against python2.7 and train is the last 2.7 release.
-            override-checkout: stable/train
-            # Provide tag specific overrides for projects that have dropped
-            # train.
-            required-projects:
-              - name: opendev.org/openstack/placement
-                override-checkout: train-eol
-              - name: opendev.org/openstack/neutron
-                override-checkout: train-eol
-              - name: opendev.org/openstack/nova
-                override-checkout: train-eol
-            vars:
-              tox_envlist: smoke
+        - tempest-full: *py2-tempest-overrides