diff --git a/.zuul.d/rally-task-load-balancing.yaml b/.zuul.d/rally-task-load-balancing.yaml
deleted file mode 100644
index c533c5a5..00000000
--- a/.zuul.d/rally-task-load-balancing.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-- job:
-    name: rally-task-load-balancing
-    description: A Rally job for checking Octavia plugins and legacy LbaasV2
-    parent: rally-task-at-devstack
-    required-projects:
-      - name: openstack/devstack
-      - name: openstack/devstack-gate
-      - name: openstack/rally
-      - name: openstack/rally-openstack
-      - name: openstack/neutron-lbaas
-      - name: openstack/octavia
-    vars:
-      devstack_plugins:
-        rally-openstack: https://opendev.org/openstack/rally-openstack
-        neutron-lbaas: https://opendev.org/openstack/neutron-lbaas
-        octavia: https://opendev.org/openstack/octavia
-      devstack_services:
-        neutron-lbaas: true
-        octavia: true
-        o-api: true
-        o-cw: true
-        o-hm: true
-        o-hk: true
-        # disable redundant services for the job
-        ceilometer-acentral: false
-        ceilometer-acompute: false
-        ceilometer-alarm-evaluator: false
-        ceilometer-alarm-notifier: false
-        ceilometer-anotification: false
-        ceilometer-api: false
-        ceilometer-collector: false
-        horizon: false
-        tempest: false
-      rally_task: rally-jobs/load-balancing.yaml
diff --git a/.zuul.d/rally-task-octavia.yaml b/.zuul.d/rally-task-octavia.yaml
new file mode 100644
index 00000000..1720d836
--- /dev/null
+++ b/.zuul.d/rally-task-octavia.yaml
@@ -0,0 +1,31 @@
+- job:
+    name: rally-task-octavia
+    description: A Rally job for checking Octavia Plugin
+    parent: rally-task-at-devstack
+    required-projects:
+      - name: openstack/devstack-gate
+      - name: openstack/diskimage-builder
+      - name: openstack/octavia
+      - name: openstack/octavia-lib
+      - name: openstack/python-octaviaclient
+      - name: openstack/barbican
+      - name: openstack/python-barbicanclient
+    vars:
+      devstack_plugins:
+        rally-openstack: https://opendev.org/openstack/rally-openstack
+        octavia: https://opendev.org/openstack/octavia
+        neutron: https://opendev.org/openstack/neutron
+        barbican: https://opendev.org/openstack/barbican
+      devstack_services:
+        nova: true
+        glance: true
+        placement: true
+        octavia: true
+        barvican: true
+        o-api: true
+        o-cw: true
+        o-hk: true
+        o-hm: true
+        o-da: true
+
+      rally_task: rally-jobs/octavia.yaml
diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
index 3de69fe7..95eb36dc 100644
--- a/.zuul.d/zuul.yaml
+++ b/.zuul.d/zuul.yaml
@@ -34,8 +34,7 @@
             voting: false
         - rally-task-ironic
         - rally-task-keystone-glance-swift
-        - rally-task-load-balancing:
-            voting: false
+        - rally-task-octavia
         - rally-task-magnum:
             voting: false
             files:
@@ -86,6 +85,7 @@
         #- rally-task-heat
         - rally-task-ironic
         - rally-task-keystone-glance-swift
+        - rally-task-octavia
         - rally-task-mistral
         - rally-task-murano
         - rally-task-neutron
diff --git a/devstack/features.yaml b/devstack/features.yaml
index 1794d503..5cfc7d70 100644
--- a/devstack/features.yaml
+++ b/devstack/features.yaml
@@ -50,7 +50,6 @@ config:
     features: [cinder-mn-grenade-sub-bak]
   neutron_dvr:
     features: [neutron-dvr]
-
 branches:
   # The value of ""default" is the name of the "trunk" branch
   default: master
diff --git a/rally-jobs/load-balancing.yaml b/rally-jobs/octavia.yaml
similarity index 90%
rename from rally-jobs/load-balancing.yaml
rename to rally-jobs/octavia.yaml
index 3fbca907..4b2bfe88 100644
--- a/rally-jobs/load-balancing.yaml
+++ b/rally-jobs/octavia.yaml
@@ -1,25 +1,9 @@
 ---
   version: 2
-  title: Task for rally-task-load-balancing job
+  title: Task for rally-task-octavia job
   description: >
     This task contains various scenarios for testing load balancing
   subtasks:
-    -
-      title: Test Legacy lbaas neutron extension
-      scenario:
-        NeutronLoadbalancerV2.create_and_list_loadbalancers:
-          lb_create_args: {}
-      runner:
-        constant:
-          times: 2
-          concurrency: 2
-      contexts:
-        users:
-          tenants: 2
-        network: {}
-      sla:
-        failure_rate:
-          max: 0
     -
       title: Octavia.create_and_list_loadbalancers
       workloads: