diff --git a/setup.cfg b/setup.cfg
index abbd0724e..47c9e0bf1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,7 +7,7 @@ license = Apache License, Version 2.0
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page = https://docs.openstack.org/python-tripleoclient/latest/
-python_requires = >=3.6
+python_requires = >=3.8
 classifier =
     Environment :: Console
     Environment :: OpenStack
@@ -20,8 +20,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/layout.yaml b/zuul.d/layout.yaml
index 338eff02f..de6cafb1e 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -3,7 +3,7 @@
       - check-requirements
       - openstack-cover-jobs
       - openstackclient-plugin-jobs
-      - openstack-python3-yoga-jobs
+      - openstack-python3-zed-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
       - tripleo-buildimage-jobs
@@ -16,7 +16,7 @@
         - tripleo-ci-centos-9-content-provider:
             dependencies:
               - openstack-tox-pep8
-              - openstack-tox-py36
+              - openstack-tox-py38
               - openstack-tox-py39
         - tripleo-ci-centos-9-standalone:
             vars: