diff --git a/.zuul.yaml b/.zuul.yaml
index 450eeae..53feee6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,5 +1,19 @@
 - project:
     templates:
       - check-requirements
-      - openstack-python3-xena-jobs
+      - openstack-python3-yoga-jobs
       - publish-openstack-docs-pti
+    check:
+      jobs:
+        # NOTE(rpittau): yoga jobs support py38 and py39 but we want to keep
+        # testing py36 to maintain compatibility with older distributions like
+        # CentOS Stream 8, Ubuntu Bionic, Debian 10, and openSuse Leap
+        # Remove after Yoga
+        - openstack-tox-py36
+    gate:
+      jobs:
+        # NOTE(rpittau): yoga jobs support py38 and py39 but we want to keep
+        # testing py36 to maintain compatibility with older distributions like
+        # CentOS Stream 8, Ubuntu Bionic, Debian 10, and openSuse Leap
+        # Remove after Yoga
+        - openstack-tox-py36