diff --git a/.zuul.yaml b/.zuul.yaml
index 5101269..df9f33e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,13 +1,25 @@
+- job:
+    name: manila-image-elements-buildimage-docker
+    parent: legacy-base
+    run: playbooks/manila-buildimage-docker/run.yaml
+    timeout: 1800
+
+- job:
+    name: manila-image-elements-buildimage-generic
+    parent: legacy-base
+    run: playbooks/manila-buildimage-generic/run.yaml
+    timeout: 1800
+
 - project:
     templates:
       - check-requirements
       - build-openstack-sphinx-docs
+      - openstack-lower-constraints-jobs
     check:
       jobs:
-        - openstack-tox-lower-constraints
         - openstack-tox-pep8
-        - legacy-manila-buildimage-generic
-        - legacy-manila-buildimage-docker:
+        - manila-image-elements-buildimage-generic
+        - manila-image-elements-buildimage-docker:
             voting: false
         - manila-tempest-dsvm-container-scenario-custom-image:
             voting: false
@@ -21,9 +33,8 @@
               - ^setup.cfg$
     gate:
       jobs:
-        - openstack-tox-lower-constraints
         - openstack-tox-pep8
-        - legacy-manila-buildimage-generic
+        - manila-image-elements-buildimage-generic
     post:
       jobs:
         - legacy-manila-publishimage-generic
diff --git a/playbooks/manila-buildimage-docker/run.yaml b/playbooks/manila-buildimage-docker/run.yaml
new file mode 100644
index 0000000..b57b383
--- /dev/null
+++ b/playbooks/manila-buildimage-docker/run.yaml
@@ -0,0 +1,49 @@
+- hosts: all
+  name: Autoconverted job legacy-manila-buildimage-docker from old job gate-manila-buildimage-docker-ubuntu-xenial
+  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
+          ./tools/gate/build-images docker
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/manila-buildimage-generic/run.yaml b/playbooks/manila-buildimage-generic/run.yaml
new file mode 100644
index 0000000..054b217
--- /dev/null
+++ b/playbooks/manila-buildimage-generic/run.yaml
@@ -0,0 +1,49 @@
+- hosts: all
+  name: Autoconverted job legacy-manila-buildimage-generic from old job gate-manila-buildimage-generic-ubuntu-xenial
+  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
+          ./tools/gate/build-images generic
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'