diff --git a/.zuul.yaml b/.zuul.yaml
index 14faf50c..e9d54721 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,16 +5,16 @@
       - publish-opendev-tox-docs
     check:
       jobs: &jobs
-        - build-python-release:
-            nodeset: ubuntu-focal
+        - build-python-release
         - tox-linters
         - tox-py35:
             nodeset: ubuntu-xenial
-        - tox-py36
-        - tox-py37
+        - tox-py36:
+            nodeset: ubuntu-bionic
+        - tox-py37:
+            nodeset: ubuntu-bionic
         - tox-py38
-        - tox-py39:
-            nodeset: ubuntu-focal
+        - tox-py39
     gate:
       jobs: *jobs
     promote:
@@ -22,5 +22,4 @@
         - opendev-promote-python
     release:
       jobs:
-        - opendev-release-python:
-            nodeset: ubuntu-focal
+        - opendev-release-python