diff --git a/.zuul.yaml b/.zuul.yaml
index 33cf899..64efcce 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,6 +1,6 @@
 - project:
     templates:
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-yoga-jobs
       - check-requirements
     gate:
       queue: os-win
diff --git a/releasenotes/notes/drop-python-3-6-and-3-7-fbf1c519725da78b.yaml b/releasenotes/notes/drop-python-3-6-and-3-7-fbf1c519725da78b.yaml
new file mode 100644
index 0000000..3d5e4e3
--- /dev/null
+++ b/releasenotes/notes/drop-python-3-6-and-3-7-fbf1c519725da78b.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.
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index ebebfc3..e9ee855 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,6 +6,7 @@ description-file =
 author = Cloudbase Solutions
 author-email = info@cloudbasesolutions.com
 home-page = https://opendev.org/openstack/oswin-tempest-plugin
+python_requires = >=3.8
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -15,8 +16,6 @@ classifier =
     Operating System :: Microsoft :: Windows
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
 
 [files]