diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 75e06732..684b245 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -115,39 +115,6 @@
       - ^tobiko/tests/unit/
 
 
-- job:
-    name: devstack-tobiko-octavia
-    parent: devstack-tobiko
-    abstract: true
-    description: |
-      Base Tobiko devstack job to be used with Octavia.
-
-    required-projects:
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/octavia
-      - openstack/octavia-lib
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-    vars:
-      devstack_services:
-        # Octavia
-        octavia: true
-        o-cw: true
-        o-hk: true
-        o-hm: true
-        o-api: true
-      zuul_copy_output:
-        '/var/log/dib-build/': logs
-        '/var/log/octavia-tenant-traffic.log': logs
-        '/var/log/octavia-amphora.log': logs
-      extensions_to_txt:
-        conf: true
-        log: true
-        yaml: true
-        yml: true
-
-
 - job: &DEVSTACK_TOBIKO_GATE_JOB
     name: devstack-tobiko-gate
     parent: devstack-tobiko
@@ -181,7 +148,7 @@
 
 - job:
     name: devstack-tobiko-multinode
-    parent: devstack-tobiko-octavia
+    parent: devstack-tobiko
     abstract: true
     description: Base DevStack Tobiko job with multinode.
     pre-run: playbooks/multinode-setup.yaml
diff --git a/zuul.d/octavia.yaml b/zuul.d/octavia.yaml
new file mode 100644
index 0000000..20b2dba
--- /dev/null
+++ b/zuul.d/octavia.yaml
@@ -0,0 +1,54 @@
+---
+
+- job: &OCTAVIA_BASE
+    name: devstack-tobiko-octavia
+    parent: devstack-tobiko
+    abstract: true
+    required-projects:
+      - openstack/barbican
+      - openstack/diskimage-builder
+      - openstack/octavia
+      - openstack/octavia-lib
+      - openstack/python-barbicanclient
+      - openstack/tripleo-image-elements
+    vars:
+      devstack_plugins:
+        barbican: https://opendev.org/openstack/barbican.git
+        octavia: https://opendev.org/openstack/octavia.git
+      devstack_services:
+        # Octavia
+        octavia: true
+        o-cw: true
+        o-hk: true
+        o-hm: true
+        o-api: true
+      zuul_copy_output:
+        '/var/log/dib-build/': logs
+        '/var/log/octavia-tenant-traffic.log': logs
+        '/var/log/octavia-amphora.log': logs
+
+
+# --- Gate -------------------------------------------------------------------
+
+- job:
+    <<: *OCTAVIA_BASE
+    name: devstack-tobiko-gate-octavia
+    parent: devstack-tobiko-gate
+    abstract: false
+    description: |
+      Tobiko devstack job used to gate with OVS and Octavia
+    voting: true
+
+
+- job:
+    name: devstack-tobiko-gate-octavia-centos
+    parent: devstack-tobiko-gate-octavia
+    nodeset: devstack-single-node-centos-8
+    voting: false
+
+
+- job:
+    name: devstack-tobiko-gate-octavia-ubuntu
+    parent: devstack-tobiko-gate-octavia
+    nodeset: openstack-single-node-focal
+    voting: false
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index d0ebfc7..e639c25 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -8,8 +8,9 @@
     check: &gate_check_pipeline
       jobs:
         - devstack-tobiko-gate
-        - devstack-tobiko-gate-ovn
         - devstack-tobiko-gate-multinode
+        - devstack-tobiko-gate-octavia
+        - devstack-tobiko-gate-ovn
 
     gate: *gate_check_pipeline
 
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 0e40d28..3dc62f7 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -11,6 +11,8 @@
       jobs:
         - devstack-tobiko-gate-centos
         - devstack-tobiko-gate-ubuntu
+        - devstack-tobiko-gate-octavia-centos
+        - devstack-tobiko-gate-octavia-ubuntu
         - devstack-tobiko-gate-ovn-centos
         - devstack-tobiko-gate-ovn-ubuntu
         - devstack-tobiko-faults-centos