diff --git a/.zuul.yaml b/.zuul.yaml
index b97bb5f425a3..1286be3fd731 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -410,6 +410,7 @@
     irrelevant-files: *nova-base-irrelevant-files
     # Run post-tempest tests like for nova-manage commands.
     post-run: playbooks/nova-next/post.yaml
+    pre-run: playbooks/nova-next/pre.yaml
     required-projects:
         - novnc/novnc
     nodeset:
diff --git a/playbooks/nova-next/pre.yaml b/playbooks/nova-next/pre.yaml
new file mode 100644
index 000000000000..dd090a9a1739
--- /dev/null
+++ b/playbooks/nova-next/pre.yaml
@@ -0,0 +1,18 @@
+- hosts: controller
+  tasks:
+    - name: create local.sh
+      become: yes
+      blockinfile:
+        path: /opt/stack/devstack/local.sh
+        create: True
+        mode: 0777
+        block: |
+          #!/bin/bash
+          set -x
+          image_ids=$(openstack image list -f value -c ID)
+
+          echo "Setting required image metadata properties"
+          for image_id in $image_ids; do
+              openstack image set --property hw_scsi_model=virtio-scsi ${image_id}
+          done
+          openstack image list