diff --git a/.zuul.yaml b/.zuul.yaml
index 808f0a09b3..be3a7890fe 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -29,7 +29,7 @@
         - manila-tempest-minimal-dsvm-cephfs-nfs-centos-7:
             voting: false
         - manila-tempest-minimal-dsvm-dummy
-        - manila-tempest-minimal-dsvm-lvm-centos-7
+        - manila-tempest-minimal-dsvm-lvm
         - manila-grenade:
             voting: false
         - manila-rally-multibackend:
@@ -45,7 +45,7 @@
       jobs:
         - manila-tox-genconfig
         - manila-tempest-minimal-dsvm-dummy
-        - manila-tempest-minimal-dsvm-lvm-centos-7
+        - manila-tempest-minimal-dsvm-lvm
     experimental:
       jobs:
         - manila-tempest-dsvm-glusterfs-nfs
@@ -319,12 +319,11 @@
       - openstack/tempest
 
 - job:
-    name: manila-tempest-minimal-dsvm-lvm-centos-7
+    name: manila-tempest-minimal-dsvm-lvm
     parent: manila-tempest-base
-    run: playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
-    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/post.yaml
+    run: playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
+    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml
     timeout: 5400
-    nodeset: legacy-centos-7
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/manila
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml
similarity index 95%
rename from playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/post.yaml
rename to playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/post.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
similarity index 80%
rename from playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
rename to playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
index 24aa33f74e..cf366ea0ec 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
@@ -1,6 +1,6 @@
 - hosts: all
-  name: Autoconverted job legacy-manila-tempest-minimal-dsvm-lvm-centos-7 from old
-    job gate-manila-tempest-minimal-dsvm-lvm-centos-7
+  name: Autoconverted job legacy-manila-tempest-minimal-dsvm-lvm from old
+    job gate-manila-tempest-minimal-dsvm-lvm
   tasks:
 
     - name: Ensure legacy workspace directory
@@ -24,13 +24,6 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
 
-    # Install centos-release-openstack-* needed for rabbitmq-server
-    - name: Add centos-release-openstack-pike support
-      become: yes
-      yum:
-        name: centos-release-openstack-pike
-        state: present
-
     - shell:
         cmd: |
           set -e
@@ -46,32 +39,6 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
 
-    - name: Check for /etc/yum/vars/contentdir
-      stat:
-        path: /etc/yum/vars/contentdir
-      register: yum_contentdir
-
-    - when: not yum_contentdir.stat.exists
-      block:
-
-      - name: Discover package architecture
-        command: rpm -q --qf "%{arch}" -f /etc/redhat-release
-        register: rpm_arch
-
-      - debug:
-          msg: Package architecture is '{{ rpm_arch.stdout }}'
-
-      - name: Set contentdir to altarch
-        set_fact:
-          yum_contentdir: altarch
-        when: rpm_arch.stdout in ['aarch64', 'ppc64le']
-
-      - name: Populate /etc/yum/vars/contentdir
-        copy:
-          dest: /etc/yum/vars/contentdir
-          content: "{{ yum_contentdir|default('centos') }}"
-        become: true
-
     - shell:
         cmd: |
           set -e