diff --git a/.zuul.yaml b/.zuul.yaml
index 313ce49..636acb9 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,5 +1,5 @@
 - job:
-    name: patrole-dsvm-base
+    name: patrole-base
     parent: legacy-dsvm-base
     timeout: 7800
     irrelevant-files:
@@ -15,7 +15,7 @@
       - openstack/tempest
 
 - job:
-    name: patrole-dsvm-base-multinode
+    name: patrole-base-multinode
     parent: legacy-dsvm-base-multinode
     timeout: 7800
     irrelevant-files:
@@ -31,50 +31,50 @@
       - openstack/tempest
 
 - job:
-    name: tempest-dsvm-patrole-admin
-    parent: patrole-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-patrole-admin/run.yaml
-    post-run: playbooks/legacy/tempest-dsvm-patrole-admin/post.yaml
+    name: tempest-patrole-admin
+    parent: patrole-base
+    run: playbooks/legacy/tempest-patrole-admin/run.yaml
+    post-run: playbooks/legacy/tempest-patrole-admin/post.yaml
 
 - job:
-    name: tempest-dsvm-patrole-member
-    parent: patrole-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-patrole-member/run.yaml
-    post-run: playbooks/legacy/tempest-dsvm-patrole-member/post.yaml
+    name: tempest-patrole-member
+    parent: patrole-base
+    run: playbooks/legacy/tempest-patrole-member/run.yaml
+    post-run: playbooks/legacy/tempest-patrole-member/post.yaml
 
 - job:
-    name: tempest-dsvm-patrole-multinode-admin
-    parent: patrole-dsvm-base-multinode
-    run: playbooks/legacy/tempest-dsvm-patrole-multinode-admin/run.yaml
-    post-run: playbooks/legacy/tempest-dsvm-patrole-multinode-admin/post.yaml
+    name: tempest-patrole-multinode-admin
+    parent: patrole-base-multinode
+    run: playbooks/legacy/tempest-patrole-multinode-admin/run.yaml
+    post-run: playbooks/legacy/tempest-patrole-multinode-admin/post.yaml
     voting: false
     nodeset: legacy-ubuntu-xenial-2-node
 
 - job:
-    name: tempest-dsvm-patrole-multinode-member
-    parent: patrole-dsvm-base-multinode
-    run: playbooks/legacy/tempest-dsvm-patrole-multinode-member/run.yaml
-    post-run: playbooks/legacy/tempest-dsvm-patrole-multinode-member/post.yaml
+    name: tempest-patrole-multinode-member
+    parent: patrole-base-multinode
+    run: playbooks/legacy/tempest-patrole-multinode-member/run.yaml
+    post-run: playbooks/legacy/tempest-patrole-multinode-member/post.yaml
     voting: false
     nodeset: legacy-ubuntu-xenial-2-node
 
 - job:
-    name: tempest-dsvm-patrole-py35-member
-    parent: patrole-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-patrole-py35-member/run.yaml
-    post-run: playbooks/legacy/tempest-dsvm-patrole-py35-member/post.yaml
+    name: tempest-patrole-py35-member
+    parent: patrole-base
+    run: playbooks/legacy/tempest-patrole-py35-member/run.yaml
+    post-run: playbooks/legacy/tempest-patrole-py35-member/post.yaml
 
 - project:
     name: openstack/patrole
     check:
       jobs:
-        - tempest-dsvm-patrole-admin
-        - tempest-dsvm-patrole-member
-        - tempest-dsvm-patrole-py35-member
-        - tempest-dsvm-patrole-multinode-admin
-        - tempest-dsvm-patrole-multinode-member
+        - tempest-patrole-admin
+        - tempest-patrole-member
+        - tempest-patrole-py35-member
+        - tempest-patrole-multinode-admin
+        - tempest-patrole-multinode-member
     gate:
       jobs:
-        - tempest-dsvm-patrole-admin
-        - tempest-dsvm-patrole-member
-        - tempest-dsvm-patrole-py35-member
+        - tempest-patrole-admin
+        - tempest-patrole-member
+        - tempest-patrole-py35-member