diff --git a/.zuul.yaml b/.zuul.yaml
index 888269cda..4974ee8f0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -23,13 +23,13 @@
               - ^setup.cfg$
     experimental:
       jobs:
-        - legacy-murano-dsvm-functional
+        - murano-dsvm-functional
 
 - job:
     name: murano-congress-devstack-dsvm
     parent: legacy-dsvm-base
-    run: playbooks/legacy/murano-congress-devstack-dsvm/run
-    post-run: playbooks/legacy/murano-congress-devstack-dsvm/post
+    run: playbooks/legacy/murano-congress-devstack-dsvm/run.yaml
+    post-run: playbooks/legacy/murano-congress-devstack-dsvm/post.yaml
     timeout: 4200
     required-projects:
       - openstack-dev/devstack
@@ -49,8 +49,8 @@
 - job:
     name: rally-dsvm-murano-task
     parent: legacy-dsvm-base
-    run: playbooks/legacy/rally-dsvm-murano-task/run
-    post-run: playbooks/legacy/rally-dsvm-murano-task/post
+    run: playbooks/legacy/rally-dsvm-murano-task/run.yaml
+    post-run: playbooks/legacy/rally-dsvm-murano-task/post.yaml
     timeout: 7800
     required-projects:
       - openstack-infra/devstack-gate
@@ -64,8 +64,8 @@
 - job:
     name: tempest-dsvm-murano-api
     parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-murano-api/run
-    post-run: playbooks/legacy/tempest-dsvm-murano-api/post
+    run: playbooks/legacy/tempest-dsvm-murano-api/run.yaml
+    post-run: playbooks/legacy/tempest-dsvm-murano-api/post.yaml
     timeout: 7800
     required-projects:
       - openstack-infra/devstack-gate
@@ -79,8 +79,8 @@
 - job:
     name: tempest-dsvm-murano-cfapi
     parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-murano-cfapi/run
-    post-run: playbooks/legacy/tempest-dsvm-murano-cfapi/post
+    run: playbooks/legacy/tempest-dsvm-murano-cfapi/run.yaml
+    post-run: playbooks/legacy/tempest-dsvm-murano-cfapi/post.yaml
     timeout: 7800
     required-projects:
       - openstack-infra/devstack-gate
@@ -90,3 +90,17 @@
       - openstack/python-heatclient
       - openstack/python-muranoclient
       - openstack/tempest
+
+- job:
+    name: murano-dsvm-functional
+    parent: legacy-dsvm-base
+    run: playbooks/legacy/murano-dsvm-functional/run.yaml
+    post-run: playbooks/legacy/murano-dsvm-functional/post.yaml
+    timeout: 7800
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/heat
+      - openstack/murano
+      - openstack/murano-dashboard
+      - openstack/python-heatclient
+      - openstack/python-muranoclient
diff --git a/playbooks/legacy/murano-dsvm-functional/post.yaml b/playbooks/legacy/murano-dsvm-functional/post.yaml
new file mode 100644
index 000000000..dac875340
--- /dev/null
+++ b/playbooks/legacy/murano-dsvm-functional/post.yaml
@@ -0,0 +1,80 @@
+- hosts: primary
+  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=**/*nose_results.html
+          - --include=*/
+          - --exclude=*
+          - --prune-empty-dirs
+
+    - 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=**/*testr_results.html.gz
+          - --include=*/
+          - --exclude=*
+          - --prune-empty-dirs
+
+    - 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=/.testrepository/tmp*
+          - --include=*/
+          - --exclude=*
+          - --prune-empty-dirs
+
+    - 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=**/*testrepository.subunit.gz
+          - --include=*/
+          - --exclude=*
+          - --prune-empty-dirs
+
+    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
+      synchronize:
+        src: '{{ ansible_user_dir }}/workspace/'
+        dest: '{{ zuul.executor.log_root }}/tox'
+        mode: pull
+        copy_links: true
+        verify_host: true
+        rsync_opts:
+          - --include=/.tox/*/log/*
+          - --include=*/
+          - --exclude=*
+          - --prune-empty-dirs
+
+    - 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/murano-dsvm-functional/run.yaml b/playbooks/legacy/murano-dsvm-functional/run.yaml
new file mode 100644
index 000000000..fcd00e25b
--- /dev/null
+++ b/playbooks/legacy/murano-dsvm-functional/run.yaml
@@ -0,0 +1,69 @@
+- hosts: all
+  name: Autoconverted job legacy-murano-dsvm-functional from old job gate-murano-dsvm-functional-ubuntu-xenial
+  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 heat git://git.openstack.org/openstack/heat
+          enable_plugin murano git://git.openstack.org/openstack/murano
+
+          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_TEMPEST=0
+          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
+          export DEVSTACK_GATE_NEUTRON=1
+
+          export PROJECTS="openstack/heat $PROJECTS"
+          export PROJECTS="openstack/python-heatclient $PROJECTS"
+          export PROJECTS="openstack/murano $PROJECTS"
+          export PROJECTS="openstack/murano-dashboard $PROJECTS"
+          export PROJECTS="openstack/python-muranoclient $PROJECTS"
+
+          export BRANCH_OVERRIDE=default
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          function post_test_hook {
+              source $BASE/new/murano/functionaltests/post_test_hook_experimental.sh
+          }
+          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 }}'