diff --git a/setup.cfg b/setup.cfg
index ad246ff6f..1344c04d1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,11 +8,17 @@ home-page = https://docs.openstack.org/ironic-python-agent/
 summary = Ironic Python Agent Ramdisk
 license = Apache-2
 classifier =
-    Development Status :: 4 - Beta
-        Intended Audience :: Developers
-        License :: OSI Approved :: Apache Software License
-        Operating System :: OS Independent
-        Programming Language :: Python
+    Environment :: OpenStack
+    Intended Audience :: System Administrators
+    Intended Audience :: Information Technology
+    License :: OSI Approved :: Apache Software License
+    Operating System :: OS Independent
+    Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 [files]
 packages =
     ironic_python_agent
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index eaa10a323..aee1a2b1b 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -1,7 +1,7 @@
 - project:
     templates:
       - openstack-python-jobs
-      - openstack-python36-jobs
+      - openstack-python3-train-jobs
       - openstack-cover-jobs
       - publish-openstack-docs-pti
       - check-requirements