diff --git a/.zuul.yaml b/.zuul.yaml
index 606d4d96c..e8740ee34 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,7 +1,7 @@
 - project:
     templates:
       - docs-on-readthedocs
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-jobs
     vars:
       rtd_webhook_id: '47123'
 
diff --git a/setup.cfg b/setup.cfg
index 68de364b5..17f02a95d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,6 +7,7 @@ description-content-type = text/x-rst
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
 home-page = https://www.openstack.org/
+python_requires = >=3.8
 classifier =
     Environment :: OpenStack
     Intended Audience :: Developers
@@ -14,10 +15,11 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 821e81172..e9338f63e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py35,py27,pep8,docs,py39
+envlist = py3,pep8,docs
 minversion = 2.0
 skipsdist = True