diff --git a/.zuul.yaml b/.zuul.yaml
index fcf2d38..13764ce 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,3 +1,9 @@
+- job:
+    name: manila-test-image-build
+    parent: legacy-base
+    run: playbooks/manila-test-image-build/run.yaml
+    timeout: 3600
+
 - project:
     check:
       jobs:
@@ -7,4 +13,4 @@
         - openstack-tox-bashate
     experimental:
       jobs:
-        - legacy-manila-test-image-build
+        - manila-test-image-build
diff --git a/playbooks/manila-test-image-build/run.yaml b/playbooks/manila-test-image-build/run.yaml
new file mode 100644
index 0000000..80cdeb0
--- /dev/null
+++ b/playbooks/manila-test-image-build/run.yaml
@@ -0,0 +1,49 @@
+- hosts: all
+  name: Autoconverted job legacy-manila-test-image-build from old job gate-manila-test-image-build
+  roles:
+    - bindep
+
+  tasks:
+
+    - name: Ensure legacy workspace directory
+      file:
+        path: '{{ ansible_user_dir }}/workspace'
+        state: directory
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          CLONEMAP=`mktemp`
+          function cleanup {
+              # In cases where zuul-cloner is aborted during a git
+              # clone operation, git will remove the git work tree in
+              # its cleanup. The work tree in these jobs is the
+              # workspace directory, which means that subsequent
+              # jenkins post-build actions can not run because the
+              # workspace has been removed.
+              # To reduce the likelihood of this having an impact,
+              # recreate the workspace directory if needed
+              mkdir -p $WORKSPACE
+              rm -f $CLONEMAP
+          }
+          trap cleanup EXIT
+          cat > $CLONEMAP << EOF
+          clonemap:
+            - name: $ZUUL_PROJECT
+              dest: .
+          EOF
+          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
+              git://git.openstack.org $ZUUL_PROJECT
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          ./run-buildroot.sh
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'