diff --git a/.zuul.yaml b/.zuul.yaml
index 05db30ae8d..1ccf8741c5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -203,7 +203,7 @@
 - project:
     templates:
       - openstack-cover-jobs
-      - openstack-python3-xena-jobs
+      - openstack-python3-zed-jobs
       - publish-openstack-docs-pti
       - periodic-stable-jobs
       - check-requirements
diff --git a/releasenotes/notes/drop-python-3-6-and-3-7-dc90b86cedced92b.yaml b/releasenotes/notes/drop-python-3-6-and-3-7-dc90b86cedced92b.yaml
new file mode 100644
index 0000000000..db420d7390
--- /dev/null
+++ b/releasenotes/notes/drop-python-3-6-and-3-7-dc90b86cedced92b.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 c5d1f2a18c..be6b602f7a 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/keystone/latest
-python_requires = >=3.6
+python_requires = >=3.8
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -17,8 +17,8 @@ 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
 
 [files]
 data_files =
diff --git a/tox.ini b/tox.ini
index 7de678f6fa..519f8ea968 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.2.0
-envlist = py37,pep8,api-ref,docs,genconfig,genpolicy,releasenotes,protection
+envlist = py39,pep8,api-ref,docs,genconfig,genpolicy,releasenotes,protection
 ignore_basepython_conflict = true
 
 [testenv]