diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index 50dd0ef736..f3246aff4b 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -1,11 +1,5 @@
 register_project_for_upgrade octavia
 register_db_to_save octavia
 
-devstack_localrc base enable_plugin octavia https://opendev.org/openstack/octavia
-devstack_localrc target enable_plugin octavia https://opendev.org/openstack/octavia
-
-devstack_localrc base enable_service o-api o-cw o-hm o-hk octavia
-devstack_localrc target enable_service o-api o-cw o-hm o-hk octavia
-
 BASE_RUN_SMOKE=False
 TARGET_RUN_SMOKE=False
diff --git a/playbooks/legacy/grenade-devstack-octavia/post.yaml b/playbooks/legacy/grenade-devstack-octavia/post.yaml
deleted file mode 100644
index 2226f7b88f..0000000000
--- a/playbooks/legacy/grenade-devstack-octavia/post.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-- hosts: primary
-  roles:
-    - role: stage-output
-      stage_dir: "{{ ansible_user_dir }}/workspace"
-
-  tasks:
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/logs/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/grenade-devstack-octavia/run.yaml b/playbooks/legacy/grenade-devstack-octavia/run.yaml
deleted file mode 100644
index 9d88b472fb..0000000000
--- a/playbooks/legacy/grenade-devstack-octavia/run.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-- hosts: all
-  name: legacy-grenade-dsvm-octavia
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-
-          export PROJECTS="openstack/grenade $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-          export PROJECTS="openstack/octavia-lib $PROJECTS"
-          export PROJECTS="openstack/octavia-tempest-plugin $PROJECTS"
-          export PROJECTS="openstack/python-octaviaclient $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT="python-octaviaclient $DEVSTACK_PROJECT_FROM_GIT"
-
-          export GRENADE_PLUGINRC="enable_grenade_plugin octavia https://opendev.org/openstack/octavia"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"export TEMPEST_PLUGINS='/opt/stack/new/octavia-tempest-plugin'"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/etc/octavia/octavia.conf]]"$'\n'"[DEFAULT]"$'\n'"debug = True"
-
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_GRENADE=pullup
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          # Add configuration values for enabling security features in local.conf
-          function pre_test_hook {
-              if [ -f /opt/stack/old/octavia-tempest-plugin/tools/pre_test_hook.sh ] ; then
-                  . /opt/stack/old/octavia-tempest-plugin/tools/pre_test_hook.sh
-              fi
-          }
-          export -f pre_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 9216afba7c..53254efe35 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,28 +1,3 @@
-- job:
-    name: octavia-legacy-dsvm-base
-    parent: legacy-dsvm-base
-    timeout: 7800
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/octavia
-      - openstack/octavia-lib
-      - openstack/python-barbicanclient
-      - openstack/python-octaviaclient
-      - openstack/tripleo-image-elements
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^api-ref/.*$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^releasenotes/.*$
-    vars:
-      zuul_copy_output:
-        '/var/log/dib-build/': 'logs'
-        '/var/log/octavia-tenant-traffic.log': 'logs'
-        '/var/log/octavia-amphora.log': 'logs'
-
 - job:
     name: publish-openstack-octavia-amphora-image
     parent: publish-openstack-artifacts
@@ -54,16 +29,42 @@
 
 - job:
     name: octavia-grenade
-    parent: octavia-legacy-dsvm-base
-    run: playbooks/legacy/grenade-devstack-octavia/run.yaml
-    post-run: playbooks/legacy/grenade-devstack-octavia/post.yaml
+    parent: grenade
     required-projects:
-      - openstack/grenade
-      - openstack/devstack-gate
-      - openstack/octavia
-      - openstack/octavia-lib
-      - openstack/octavia-tempest-plugin
-      - openstack/python-octaviaclient
+      - opendev.org/openstack/grenade
+      - opendev.org/openstack/octavia
+      - opendev.org/openstack/octavia-lib
+      - opendev.org/openstack/octavia-tempest-plugin
+      - opendev.org/openstack/python-octaviaclient
+    vars:
+      devstack_localrc:
+        DIB_LOCAL_ELEMENTS: openstack-ci-mirrors
+        LIBVIRT_TYPE: kvm
+        LIBVIRT_CPU_MODE: host-passthrough
+      devstack_plugins:
+        octavia: https://opendev.org/openstack/octavia.git
+      devstack_services:
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
+        c-api: false
+        c-bak: false
+        c-vol: false
+        cinder: false
+        octavia: true
+        o-api: true
+        o-cw: true
+        o-hm: true
+        o-hk: true
+      tempest_plugins:
+        - octavia-tempest-plugin
+      tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.test_traffic_ops
+      tox_envlist: all
+      zuul_copy_output:
+        '/var/log/dib-build/': 'logs'
+        '/var/log/octavia-tenant-traffic.log': 'logs'
+        '/var/log/octavia-amphora.log': 'logs'
 
 - job:
     name: octavia-v2-dsvm-scenario-amphora-v2
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 12e7ea9e23..98e7381b53 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -35,15 +35,7 @@
             irrelevant-files: *irrelevant-files
         - octavia-v2-act-stdby-dsvm-scenario:
             irrelevant-files: *irrelevant-files
-        - octavia-v2-dsvm-cinder-amphora:
-            irrelevant-files: *irrelevant-files
-            voting: false
-        - octavia-v2-dsvm-scenario-two-node:
-            irrelevant-files: *irrelevant-files
-            voting: false
-        # TODO(haleyb): restore to voting once python3 issues fixed
         - octavia-grenade:
-            voting: false
             irrelevant-files:
               - ^.*\.rst$
               - ^api-ref/.*$
@@ -54,6 +46,12 @@
               - ^tools/.*$
               - ^(test-|)requirements.txt$
               - ^tox.ini$
+        - octavia-v2-dsvm-cinder-amphora:
+            irrelevant-files: *irrelevant-files
+            voting: false
+        - octavia-v2-dsvm-scenario-two-node:
+            irrelevant-files: *irrelevant-files
+            voting: false
         - octavia-v2-dsvm-scenario-amphora-v2:
             irrelevant-files: *irrelevant-files
             voting: false
@@ -74,6 +72,7 @@
         - octavia-v2-dsvm-tls-barbican
         - octavia-v2-dsvm-spare-pool
         - octavia-v2-act-stdby-dsvm-scenario
+        - octavia-grenade
     periodic:
       jobs:
         - publish-openstack-octavia-amphora-image-bionic: