diff --git a/.zuul.yaml b/.zuul.yaml
index 32efc247..175dcdbb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,7 +3,7 @@
       - check-requirements
       - horizon-non-primary-django-jobs
       - openstack-lower-constraints-jobs-horizon
-      - openstack-python3-yoga-jobs-horizon
+      - openstack-python3-zed-jobs-horizon
       - release-notes-jobs-python3
     experimental:
       jobs:
diff --git a/releasenotes/notes/drop-python-3-6-and-3-7-a6d76484c658a01b.yaml b/releasenotes/notes/drop-python-3-6-and-3-7-a6d76484c658a01b.yaml
new file mode 100644
index 00000000..db420d73
--- /dev/null
+++ b/releasenotes/notes/drop-python-3-6-and-3-7-a6d76484c658a01b.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 ec6dc578..a390a1f8 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/sahara/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