diff --git a/playbooks/roles/bifrost-create-dib-image/defaults/main.yml b/playbooks/roles/bifrost-create-dib-image/defaults/main.yml
index 87327c104..34b14a7c1 100644
--- a/playbooks/roles/bifrost-create-dib-image/defaults/main.yml
+++ b/playbooks/roles/bifrost-create-dib-image/defaults/main.yml
@@ -17,6 +17,7 @@ dib_notmpfs: false
 dib_offline: false
 dib_skipbase: false
 dib_packages: ""
+disk_image_create_log: /tmp/disk-image-create.log
 ipa_git_folder: /opt/stack/ironic-python-agent
 reqs_git_folder: /opt/stack/requirements
 ipa_builder_git_folder: /opt/stack/ironic-python-agent-builder
diff --git a/playbooks/roles/bifrost-create-dib-image/tasks/main.yml b/playbooks/roles/bifrost-create-dib-image/tasks/main.yml
index 10e00ef39..58348dd2e 100644
--- a/playbooks/roles/bifrost-create-dib-image/tasks/main.yml
+++ b/playbooks/roles/bifrost-create-dib-image/tasks/main.yml
@@ -159,7 +159,7 @@
   when: partition_info is defined and 'content' in partition_info
 - name: "Build argument list"
   set_fact:
-    dib_arglist: >
+    dib_arglist: >-
       {{ dib_trace_arg | default('') }}
       {{ dib_uncompressed_arg | default('') }}
       {{ dib_clearenv_arg | default('') }}
@@ -182,7 +182,11 @@
       {{ dib_os_element }}
       {{ dib_elements | default('') }}
 - name: "Initiate image build"
-  command: disk-image-create {{ dib_arglist }}
+  shell: |
+    set -o pipefail
+    disk-image-create {{ dib_arglist }} 2>&1 | tee {{ disk_image_create_log }}
+  args:
+    executable: /bin/bash
   environment: "{{ dib_env_vars_final | combine(bifrost_venv_env) }}"
   when:
     - not build_ramdisk | bool
diff --git a/scripts/collect-test-info.sh b/scripts/collect-test-info.sh
index c8e94ed03..bf98f0323 100755
--- a/scripts/collect-test-info.sh
+++ b/scripts/collect-test-info.sh
@@ -71,6 +71,8 @@ mkdir -p ${LOG_LOCATION}/all
 sudo cp -aL /var/log/* ${LOG_LOCATION}/all/.
 sudo chown -R $USER ${LOG_LOCATION}/all
 
+[ -f /tmp/disk-image-create.log ] && sudo cp -a /tmp/disk-image-create.log ${LOG_LOCATION}
+
 sudo systemctl > ${LOG_LOCATION}/all-services.txt
 sudo journalctl -u libvirtd &> ${LOG_LOCATION}/libvirtd.log
 sudo journalctl -u ironic &> ${LOG_LOCATION}/ironic.log