diff --git a/.zuul.yaml b/.zuul.yaml
index d5c240d..8b4aa44 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,24 +3,38 @@
     name: jjb-tox-cross-jenkins-job-builder
     description: Tests compatibility with master branch of jenkins-job-builder
     parent: tox-py27
+    nodeset: ubuntu-xenial
     required-projects:
       - jjb/python-jenkins
       - jjb/jenkins-job-builder
     voting: true
 
 - project:
-    templates:
-      - build-openstack-docs-pti
-      - openstack-cover-jobs
-      - openstack-python35-jobs
-      - openstack-python36-jobs
     check:
       jobs:
-        - openstack-tox-linters
-        - openstack-tox-py27
+        # Only in check:
+        - tox-cover:
+            nodeset: ubuntu-xenial
+        # Jobs common to gate pipeline
+        - tox-linters
+        - opendev-tox-docs:
+            nodeset: ubuntu-xenial
+        - tox-py27:
+            nodeset: ubuntu-xenial
+        - tox-py35:
+            nodeset: ubuntu-xenial
+        - tox-py36:
+            nodeset: ubuntu-bionic
         - jjb-tox-cross-jenkins-job-builder
     gate:
       jobs:
-        - openstack-tox-linters
-        - openstack-tox-py27
+        - tox-linters
+        - opendev-tox-docs:
+            nodeset: ubuntu-xenial
+        - tox-py27:
+            nodeset: ubuntu-xenial
+        - tox-py35:
+            nodeset: ubuntu-xenial
+        - tox-py36:
+            nodeset: ubuntu-bionic
         - jjb-tox-cross-jenkins-job-builder