diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml
index 2b2a3bc8..ea3e3c49 100644
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml
@@ -1,6 +1,9 @@
 - hosts: all
   name: Autoconverted job legacy-dib-dsvm-functests-python2-centos-7-extras from old
     job gate-dib-dsvm-functests-python2-centos-7-extras-nv
+  roles:
+    - bindep
+
   tasks:
 
     - name: Ensure legacy workspace directory
@@ -23,16 +26,6 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
 
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cd ~/openstack/diskimage-builder
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
     - shell:
         cmd: |
           set -u
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml
index f54176ca..30820111 100644
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml
@@ -1,6 +1,9 @@
 - hosts: all
   name: Autoconverted job legacy-dib-dsvm-functests-python2-centos-7-image from old
     job gate-dib-dsvm-functests-python2-centos-7-image-nv
+  roles:
+    - bindep
+
   tasks:
 
     - name: Ensure legacy workspace directory
@@ -23,16 +26,6 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
 
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cd ~/openstack/diskimage-builder
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
     - shell:
         cmd: |
           set -u
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml
index 3ea53443..39e8eafc 100644
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml
@@ -1,6 +1,9 @@
 - hosts: all
   name: Autoconverted job legacy-dib-dsvm-functests-python2-centos-7 from old job
     gate-dib-dsvm-functests-python2-centos-7
+  roles:
+    - bindep
+
   tasks:
 
     - name: Ensure legacy workspace directory
@@ -23,16 +26,6 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
 
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cd ~/openstack/diskimage-builder
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
     - shell:
         cmd: |
           set -u
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml
index ef67e2a9..b3947d22 100644
--- a/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml
@@ -1,6 +1,9 @@
 - hosts: all
   name: Autoconverted job legacy-dib-dsvm-functests-python2-opensuse-423 from old
     job gate-dib-dsvm-functests-python2-opensuse-423-nv
+  roles:
+    - bindep
+
   tasks:
 
     - name: Ensure legacy workspace directory
@@ -23,16 +26,6 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
 
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cd ~/openstack/diskimage-builder
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
     - shell:
         cmd: |
           set -u
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml
index da955d04..61013d2f 100644
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml
@@ -1,6 +1,9 @@
 - hosts: all
   name: Autoconverted job legacy-dib-dsvm-functests-python2-ubuntu-trusty-extras from
     old job gate-dib-dsvm-functests-python2-ubuntu-trusty-extras-nv
+  roles:
+    - bindep
+
   tasks:
 
     - name: Ensure legacy workspace directory
@@ -23,16 +26,6 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
 
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cd ~/openstack/diskimage-builder
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
     - shell:
         cmd: |
           set -u
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml
index 736179dd..bd08b952 100644
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml
@@ -1,6 +1,9 @@
 - hosts: all
   name: Autoconverted job legacy-dib-dsvm-functests-python2-ubuntu-trusty-image from
     old job gate-dib-dsvm-functests-python2-ubuntu-trusty-image-nv
+  roles:
+    - bindep
+
   tasks:
 
     - name: Ensure legacy workspace directory
@@ -23,16 +26,6 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
 
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cd ~/openstack/diskimage-builder
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
     - shell:
         cmd: |
           set -u
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml
index 5ebe0bcd..773e8f72 100644
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml
@@ -1,6 +1,9 @@
 - hosts: all
   name: Autoconverted job legacy-dib-dsvm-functests-python2-ubuntu-trusty from old
     job gate-dib-dsvm-functests-python2-ubuntu-trusty
+  roles:
+    - bindep
+
   tasks:
 
     - name: Ensure legacy workspace directory
@@ -23,16 +26,6 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
 
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cd ~/openstack/diskimage-builder
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
     - shell:
         cmd: |
           set -u
diff --git a/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml
index bb5c122f..fd41700e 100644
--- a/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml
@@ -1,5 +1,8 @@
 - hosts: all
   name: Autoconverted job legacy-dib-dsvm-functests-python3-extras from old job gate-dib-dsvm-functests-python3-ubuntu-xenial-extras-nv
+  roles:
+    - bindep
+
   tasks:
 
     - name: Ensure legacy workspace directory
@@ -22,16 +25,6 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
 
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cd ~/openstack/diskimage-builder
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
     - shell:
         cmd: |
           set -u
diff --git a/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml
index 462b856a..224b81ec 100644
--- a/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml
@@ -1,5 +1,8 @@
 - hosts: all
   name: Autoconverted job legacy-dib-dsvm-functests-python3-image from old job gate-dib-dsvm-functests-python3-ubuntu-xenial-image-nv
+  roles:
+    - bindep
+
   tasks:
 
     - name: Ensure legacy workspace directory
@@ -22,16 +25,6 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
 
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cd ~/openstack/diskimage-builder
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
     - shell:
         cmd: |
           set -u
diff --git a/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml
index 1d9de73c..a9fc615e 100644
--- a/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml
@@ -1,6 +1,9 @@
 - hosts: all
   name: Autoconverted job legacy-dib-dsvm-functests-python3-opensuse-423 from old
     job gate-dib-dsvm-functests-python3-opensuse-423-nv
+  roles:
+    - bindep
+
   tasks:
 
     - name: Ensure legacy workspace directory
@@ -23,16 +26,6 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
 
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cd ~/openstack/diskimage-builder
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
     - shell:
         cmd: |
           set -u
diff --git a/playbooks/legacy/dib-dsvm-functests-python3/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3/run.yaml
index dff4d338..840643ff 100644
--- a/playbooks/legacy/dib-dsvm-functests-python3/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python3/run.yaml
@@ -1,5 +1,8 @@
 - hosts: all
   name: Autoconverted job legacy-dib-dsvm-functests-python3 from old job gate-dib-dsvm-functests-python3-ubuntu-xenial
+  roles:
+    - bindep
+
   tasks:
 
     - name: Ensure legacy workspace directory
@@ -22,16 +25,6 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
 
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cd ~/openstack/diskimage-builder
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
     - shell:
         cmd: |
           set -u