diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 08f5af29a..1f82ba938 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -2,7 +2,7 @@
     templates:
       - check-requirements
       - openstack-cover-jobs
-      - openstack-python3-xena-jobs
+      - openstack-python3-yoga-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
       - tripleo-multinode-container-minimal-pipeline
@@ -26,7 +26,6 @@
               - openstack-tox-linters
               - openstack-tox-py36
               - openstack-tox-py37
-              - openstack-tox-py38
               - openstack-tox-py39
         - tripleo-buildimage-overcloud-full-centos-8:
             dependencies: *deps_unit_lint