diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index c7c48db..f2ad113 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -16,6 +16,7 @@
     vars:
       devstack_localrc:
         TEMPEST_PLUGINS: "'/opt/stack/octavia-tempest-plugin'"
+        USE_PYTHON3: true
       devstack_local_conf:
         post-config:
           $OCTAVIA_CONF:
@@ -104,20 +105,20 @@
       tox_envlist: all
 
 - job:
-    name: octavia-v2-dsvm-noop-py35-api
+    name: octavia-v2-dsvm-noop-py2-api
     parent: octavia-v2-dsvm-noop-api
     vars:
       devstack_localrc:
-        USE_PYTHON3: true
+        USE_PYTHON3: False
 
 - job:
-    name: octavia-v2-dsvm-noop-api-stable-rocky
-    parent: octavia-v2-dsvm-noop-api
+    name: octavia-v2-dsvm-noop-py2-api-stable-rocky
+    parent: octavia-v2-dsvm-noop-py2-api
     override-checkout: stable/rocky
 
 - job:
-    name: octavia-v2-dsvm-noop-api-stable-queens
-    parent: octavia-v2-dsvm-noop-api
+    name: octavia-v2-dsvm-noop-py2-api-stable-queens
+    parent: octavia-v2-dsvm-noop-py2-api
     override-checkout: stable/queens
 
 - job:
@@ -134,25 +135,25 @@
       tox_envlist: all
 
 - job:
-    name: octavia-v2-dsvm-py35-scenario
+    name: octavia-v2-dsvm-py2-scenario
     parent: octavia-v2-dsvm-scenario
     vars:
       devstack_localrc:
-        USE_PYTHON3: true
+        USE_PYTHON3: False
 
 - job:
-    name: octavia-v2-dsvm-scenario-stable-rocky
-    parent: octavia-v2-dsvm-scenario
+    name: octavia-v2-dsvm-py2-scenario-stable-rocky
+    parent: octavia-v2-dsvm-py2-scenario
     override-checkout: stable/rocky
 
 - job:
-    name: octavia-v2-dsvm-scenario-stable-queens
-    parent: octavia-v2-dsvm-scenario
+    name: octavia-v2-dsvm-py2-scenario-stable-queens
+    parent: octavia-v2-dsvm-py2-scenario
     override-checkout: stable/queens
 
 - job:
-    name: octavia-v2-dsvm-scenario-centos-7
-    parent: octavia-v2-dsvm-scenario
+    name: octavia-v2-dsvm-py2-scenario-centos-7
+    parent: octavia-v2-dsvm-py2-scenario
     nodeset: devstack-single-node-centos-7
     vars:
       devstack_localrc:
@@ -167,3 +168,17 @@
       devstack_localrc:
         OCTAVIA_AMP_BASE_OS: ubuntu
         OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: bionic
+
+# Temporary transitional aliases for gates used in other repos
+# Remove once octavia has transitioned job names
+- job:
+    name: octavia-v2-dsvm-noop-py35-api
+    parent: octavia-v2-dsvm-noop-api
+
+- job:
+    name: octavia-v2-dsvm-py35-scenario
+    parent: octavia-v2-dsvm-scenario
+
+- job:
+    name: octavia-v2-dsvm-scenario-centos-7
+    parent: octavia-v2-dsvm-py2-scenario-centos-7
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index fc3b111..ad0a080 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -8,13 +8,13 @@
     check:
       jobs:
         - octavia-v2-dsvm-noop-api
-        - octavia-v2-dsvm-noop-api-stable-rocky
-        - octavia-v2-dsvm-noop-api-stable-queens
-        - octavia-v2-dsvm-noop-py35-api
+        - octavia-v2-dsvm-noop-py2-api
+        - octavia-v2-dsvm-noop-py2-api-stable-rocky
+        - octavia-v2-dsvm-noop-py2-api-stable-queens
         - octavia-v2-dsvm-scenario
-        - octavia-v2-dsvm-scenario-stable-rocky
-        - octavia-v2-dsvm-scenario-stable-queens
-        - octavia-v2-dsvm-py35-scenario
+        - octavia-v2-dsvm-py2-scenario
+        - octavia-v2-dsvm-py2-scenario-stable-rocky
+        - octavia-v2-dsvm-py2-scenario-stable-queens
         - octavia-v2-dsvm-scenario-centos-7:
             voting: false
         - octavia-v2-dsvm-scenario-ubuntu-bionic:
@@ -23,10 +23,10 @@
       queue: octavia
       jobs:
         - octavia-v2-dsvm-noop-api
-        - octavia-v2-dsvm-noop-api-stable-rocky
-        - octavia-v2-dsvm-noop-api-stable-queens
-        - octavia-v2-dsvm-noop-py35-api
+        - octavia-v2-dsvm-noop-py2-api
+        - octavia-v2-dsvm-noop-py2-api-stable-rocky
+        - octavia-v2-dsvm-noop-py2-api-stable-queens
         - octavia-v2-dsvm-scenario
-        - octavia-v2-dsvm-scenario-stable-rocky
-        - octavia-v2-dsvm-scenario-stable-queens
-        - octavia-v2-dsvm-py35-scenario
+        - octavia-v2-dsvm-py2-scenario
+        - octavia-v2-dsvm-py2-scenario-stable-rocky
+        - octavia-v2-dsvm-py2-scenario-stable-queens