diff --git a/.zuul.yaml b/.zuul.yaml
index 423792a53e04b426528762deb0ab6b0b433bccd8..0449dc522c68f03b32336386318482cb56060f9c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,7 +2,7 @@
     templates:
       - check-requirements
       - openstack-cover-jobs
-      - openstack-python3-wallaby-jobs
+      - openstack-python3-zed-jobs
       - publish-openstack-docs-pti
       - build-release-notes-jobs-python3
     check:
diff --git a/setup.cfg b/setup.cfg
index 95b2410a6e43288683374110f6185e210db93fd5..cb09c3e590d426b861f475ac3e8b04877cbeb1dd 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/python-magnumclient/latest/
-python-requires = >=3.6
+python-requires = >=3.8
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -16,11 +16,9 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 2
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 
 [files]
 packages =