diff --git a/setup.cfg b/setup.cfg
index 1e8b8b4de..2f9b5f4ef 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@ description_file =
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page = https://docs.openstack.org/tripleo-common/latest/
-python_requires = >=3.6
+python_requires = >=3.8
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -17,8 +17,6 @@ classifier =
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
 
diff --git a/zuul.d/cross-jobs.yaml b/zuul.d/cross-jobs.yaml
index 8cf79702e..1bf67e81a 100644
--- a/zuul.d/cross-jobs.yaml
+++ b/zuul.d/cross-jobs.yaml
@@ -1,7 +1,7 @@
 - job:
-    name: tripleo-cross-tripleoclient-py37
-    parent: openstack-tox-py37
-    description: Run cross-project tests on tripleoclient from HEAD with py37
+    name: tripleo-cross-tripleoclient-py39
+    parent: openstack-tox-py39
+    description: Run cross-project tests on tripleoclient from HEAD with py39
     vars:
       zuul_work_dir: src/opendev.org/openstack/python-tripleoclient
     required-projects:
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index c004f9924..9cc50cf6f 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -2,7 +2,7 @@
     templates:
       - check-requirements
       - openstack-cover-jobs
-      - openstack-python3-yoga-jobs
+      - openstack-python3-zed-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
       - tripleo-multinode-container-minimal-pipeline
@@ -15,16 +15,10 @@
     check:
       jobs:
         - openstack-tox-linters
-        - openstack-tox-py36
-        - openstack-tox-py37
-        - openstack-tox-py38
-        - openstack-tox-py39
-        - tripleo-cross-tripleoclient-py37
+        - tripleo-cross-tripleoclient-py39
         - tripleo-ci-centos-9-content-provider:
             dependencies: &deps_unit_lint
               - openstack-tox-linters
-              - openstack-tox-py36
-              - openstack-tox-py37
               - openstack-tox-py39
         - tripleo-buildimage-overcloud-full-centos-9:
             dependencies: *deps_unit_lint
@@ -37,6 +31,5 @@
     gate:
       queue: tripleo
       jobs:
-        - openstack-tox-py37
         - openstack-tox-linters
-        - tripleo-cross-tripleoclient-py37
+        - tripleo-cross-tripleoclient-py39