diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 0983e938e..5118d3396 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -8,6 +8,11 @@
       - release-notes-jobs-python3
     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
         - openstack-tox-functional
         - ipa-tox-examples
         # NOTE(iurygregory) Only run this two jobs since we are testing
@@ -36,6 +41,11 @@
     gate:
       queue: ironic
       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
         - openstack-tox-functional
         - ipa-tempest-bios-ipmi-direct-src
         - ipa-tempest-uefi-redfish-vmedia-src