diff --git a/playbooks/ci/run.yaml b/playbooks/ci/run.yaml
index 76ddd2655..4cbe08664 100644
--- a/playbooks/ci/run.yaml
+++ b/playbooks/ci/run.yaml
@@ -1,8 +1,11 @@
 - hosts: all
   tasks:
     - shell:
-        cmd: bash scripts/test-bifrost.sh 2>&1 | tee "{{ ansible_user_dir }}/bifrost.log"
+        cmd: |
+          set -eo pipefail
+          ./scripts/test-bifrost.sh 2>&1 | tee "{{ ansible_user_dir }}/bifrost.log"
         chdir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/bifrost'].src_dir }}"
+        executable: /bin/bash
       environment:
         BIFROST_TRACE: "true"
         BUILD_IMAGE: "{{ build_image | default(false) | bool | lower }}"
diff --git a/scripts/collect-test-info.sh b/scripts/collect-test-info.sh
index f73c7cb70..1becd0100 100755
--- a/scripts/collect-test-info.sh
+++ b/scripts/collect-test-info.sh
@@ -82,7 +82,8 @@ sudo journalctl -u uwsgi@keystone-public &> ${LOG_LOCATION}/keystone-public.log
 
 # Copy PXE information
 mkdir -p ${LOG_LOCATION}/pxe/
-cp /httpboot/ipxe.* ${LOG_LOCATION}/pxe/
+ls -lR /httpboot > ${LOG_LOCATION}/pxe/listing.txt
+cp -aL /httpboot/*.ipxe ${LOG_LOCATION}/pxe/
 cp -aL /httpboot/pxelinux.cfg/ ${LOG_LOCATION}/pxe/
 
 # Copy baremetal information
diff --git a/scripts/test-bifrost.sh b/scripts/test-bifrost.sh
index 77c48611a..648380f5c 100755
--- a/scripts/test-bifrost.sh
+++ b/scripts/test-bifrost.sh
@@ -139,7 +139,6 @@ on_exit() {
     $SCRIPT_HOME/collect-test-info.sh
 }
 trap on_exit EXIT
-trap on_exit ERR
 
 # Change working directory
 cd $BIFROST_HOME/playbooks