diff --git a/.zuul.yaml b/.zuul.yaml
index 98d0559..325a5a4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,5 +2,5 @@
     templates:
       - publish-openstack-docs-pti
       - check-requirements
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-yoga-jobs
       - release-notes-jobs-python3
diff --git a/setup.cfg b/setup.cfg
index fc29f56..ac5e6f1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,8 @@ classifier =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: Implementation :: CPython
 
diff --git a/tox.ini b/tox.ini
index 7f80312..215c425 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.18.0
-envlist = py37,pep8
+envlist = py39,pep8
 ignore_basepython_conflict = true
 
 [testenv]