diff --git a/releasenotes/notes/drop-py36-and-py37-85cf389b2842f045.yaml b/releasenotes/notes/drop-py36-and-py37-85cf389b2842f045.yaml
new file mode 100644
index 000000000..ec0c16847
--- /dev/null
+++ b/releasenotes/notes/drop-py36-and-py37-85cf389b2842f045.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Support for Python versions 3.6 and 3.7 was dropped. The minimum supported
+    version is now Python 3.8.
diff --git a/setup.cfg b/setup.cfg
index 90296e5e5..0fcc4b4e5 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-manilaclient/latest/
-python_requires = >=3.6
+python_requires = >=3.8
 classifier =
    Development Status :: 5 - Production/Stable
    Environment :: Console
@@ -18,8 +18,6 @@ classifier =
    Programming Language :: Python
    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/project.yaml b/zuul.d/project.yaml
index a6acb6d0e..c78c3868c 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -2,7 +2,7 @@
     templates:
       - publish-openstack-docs-pti
       - openstack-cover-jobs
-      - openstack-python3-yoga-jobs
+      - openstack-python3-zed-jobs
       - check-requirements
       - release-notes-jobs-python3
     check: