diff --git a/.zuul.yaml b/.zuul.yaml
index ae2445f931..d76ea839d9 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -20,8 +20,7 @@
     templates:
       - openstack-cover-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - publish-openstack-docs-pti
       - periodic-stable-jobs
       - release-notes-jobs-python3
diff --git a/setup.cfg b/setup.cfg
index aa55eafaf4..a5d6aa8295 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,6 +18,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
     Topic :: System :: Monitoring
 
 [global]