diff --git a/.zuul.yaml b/.zuul.yaml
index be3a7890fe..f055579ec6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -24,9 +24,9 @@
             voting: false
         - manila-tempest-dsvm-scenario:
             voting: false
-        - manila-tempest-minimal-dsvm-cephfs-native-centos-7:
+        - manila-tempest-minimal-dsvm-cephfs-native:
             voting: false
-        - manila-tempest-minimal-dsvm-cephfs-nfs-centos-7:
+        - manila-tempest-minimal-dsvm-cephfs-nfs:
             voting: false
         - manila-tempest-minimal-dsvm-dummy
         - manila-tempest-minimal-dsvm-lvm
@@ -52,6 +52,8 @@
         - manila-tempest-dsvm-glusterfs-native
         - manila-tempest-dsvm-glusterfs-nfs-heketi
         - manila-tempest-dsvm-glusterfs-native-heketi
+        - manila-tempest-minimal-dsvm-cephfs-native-centos-7
+        - manila-tempest-minimal-dsvm-cephfs-nfs-centos-7
 
 - job:
     name: manila-grenade
@@ -290,6 +292,20 @@
       - openstack/python-manilaclient
       - openstack/tempest
 
+- job:
+    name: manila-tempest-minimal-dsvm-cephfs-native
+    parent: manila-tempest-base
+    run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml
+    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml
+    timeout: 5400
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/devstack-plugin-ceph
+      - openstack/manila
+      - openstack/manila-tempest-plugin
+      - openstack/python-manilaclient
+      - openstack/tempest
+
 - job:
     name: manila-tempest-minimal-dsvm-cephfs-nfs-centos-7
     parent: manila-tempest-base
@@ -305,6 +321,21 @@
       - openstack/python-manilaclient
       - openstack/tempest
 
+- job:
+    name: manila-tempest-minimal-dsvm-cephfs-nfs
+    parent: manila-tempest-base
+    run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml
+    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml
+    timeout: 5400
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/devstack-plugin-ceph
+      - openstack/manila
+      - openstack/manila-tempest-plugin
+      - openstack/python-manilaclient
+      - openstack/tempest
+
+
 - job:
     name: manila-tempest-minimal-dsvm-dummy
     parent: manila-tempest-base
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml
new file mode 100644
index 0000000000..e9b9d7f3a6
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml
@@ -0,0 +1,15 @@
+- hosts: controller
+  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/manila-tempest-minimal-dsvm-cephfs-native/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml
new file mode 100644
index 0000000000..424c45fc70
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml
@@ -0,0 +1,96 @@
+- hosts: all
+  name: legacy-manila-tempest-minimal-dsvm-cephfs-native-ubuntu-bionic
+  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-infra/devstack-gate
+              dest: devstack-gate
+          EOF
+          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
+              git://git.openstack.org \
+              openstack-infra/devstack-gate
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          cat << 'EOF' >>"/tmp/dg-local.conf"
+          [[local|localrc]]
+          enable_plugin manila git://git.openstack.org/openstack/manila
+
+          enable_plugin devstack-plugin-ceph git://git.openstack.org/openstack/devstack-plugin-ceph
+
+          # Enable CephFS as the backend for Manila.
+          ENABLE_CEPH_MANILA=True
+
+          # Disable Ceph as the storage backend for Nova.
+          ENABLE_CEPH_NOVA=False
+
+          # Disable Ceph as the storage backend for Glance.
+          ENABLE_CEPH_GLANCE=False
+
+          # Disable Ceph as the storage backend for Cinder.
+          ENABLE_CEPH_CINDER=False
+
+          # Disable Ceph as the storage backend for Cinder backup.
+          ENABLE_CEPH_C_BAK=False
+
+          # Set native or NFS variant of ceph driver
+          MANILA_CEPH_DRIVER=cephfsnative
+
+          EOF
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_NEUTRON=1
+          export ENABLED_SERVICES=tempest
+          export PROJECTS="openstack/devstack-plugin-ceph $PROJECTS"
+          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
+          export KEEP_LOCALRC=1
+          export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
+          export OVERRIDE_ENABLED_SERVICES
+
+          function pre_test_hook {
+              # Configure Manila with a CephFS Native or NFS driver backend.
+              # Refer to job-template pre_test_hook for more details on the
+              # arguments.
+              source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \
+                  false cephfsnative singlebackend
+          }
+          export -f pre_test_hook
+
+          function post_test_hook {
+              # Configure and run Tempest API tests on Manila with a
+              # CephFSNative driver backend.
+              # Refer to job-template post_test_hook for more details on the
+              # arguments.
+              source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \
+                  singlebackend cephfsnative api
+          }
+          export -f post_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/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml
new file mode 100644
index 0000000000..e9b9d7f3a6
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml
@@ -0,0 +1,15 @@
+- hosts: controller
+  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/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml
new file mode 100644
index 0000000000..4b77e59b90
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml
@@ -0,0 +1,96 @@
+- hosts: all
+  name: legacy-manila-tempest-minimal-dsvm-cephfs-nfs-ubuntu-bionic
+  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-infra/devstack-gate
+              dest: devstack-gate
+          EOF
+          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
+              git://git.openstack.org \
+              openstack-infra/devstack-gate
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          cat << 'EOF' >>"/tmp/dg-local.conf"
+          [[local|localrc]]
+          enable_plugin manila git://git.openstack.org/openstack/manila
+
+          enable_plugin devstack-plugin-ceph git://git.openstack.org/openstack/devstack-plugin-ceph
+
+          # Enable CephFS as the backend for Manila.
+          ENABLE_CEPH_MANILA=True
+
+          # Disable Ceph as the storage backend for Nova.
+          ENABLE_CEPH_NOVA=False
+
+          # Disable Ceph as the storage backend for Glance.
+          ENABLE_CEPH_GLANCE=False
+
+          # Disable Ceph as the storage backend for Cinder.
+          ENABLE_CEPH_CINDER=False
+
+          # Disable Ceph as the storage backend for Cinder backup.
+          ENABLE_CEPH_C_BAK=False
+
+          # Set native or NFS variant of ceph driver
+          MANILA_CEPH_DRIVER=cephfsnfs
+
+          EOF
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_NEUTRON=1
+          export ENABLED_SERVICES=tempest
+          export PROJECTS="openstack/devstack-plugin-ceph $PROJECTS"
+          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
+          export KEEP_LOCALRC=1
+          export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
+          export OVERRIDE_ENABLED_SERVICES
+
+          function pre_test_hook {
+              # Configure Manila with a CephFS Native or NFS driver backend.
+              # Refer to job-template pre_test_hook for more details on the
+              # arguments.
+              source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \
+                  false cephfsnfs singlebackend
+          }
+          export -f pre_test_hook
+
+          function post_test_hook {
+              # Configure and run Tempest API tests on Manila with a
+              # CephFSNative driver backend.
+              # Refer to job-template post_test_hook for more details on the
+              # arguments.
+              source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \
+                  singlebackend cephfsnfs api
+          }
+          export -f post_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 }}'