diff --git a/.zuul.yaml b/.zuul.yaml
index 5f31ce77..597ee40f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,6 +1,6 @@
 - project:
     templates:
-      - openstack-python3-yoga-jobs
+      - openstack-python3-zed-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
       - check-requirements
diff --git a/releasenotes/notes/drop-python-3-6-and-3-7-c06450ace51c101d.yaml b/releasenotes/notes/drop-python-3-6-and-3-7-c06450ace51c101d.yaml
new file mode 100644
index 00000000..db420d73
--- /dev/null
+++ b/releasenotes/notes/drop-python-3-6-and-3-7-c06450ace51c101d.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Python 3.6 & 3.7 support has been dropped. The minimum version of Python now
+    supported is Python 3.8.
diff --git a/setup.cfg b/setup.cfg
index d7d81720..9e4433c3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@ description_file =
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page = http://www.openstack.org/
-python_requires = >=3.6
+python_requires = >=3.8
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -15,9 +15,8 @@ classifier =
     Operating System :: POSIX :: Linux
     Programming Language :: Python
     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 =