diff --git a/scripts/devenv-builder/configure-vm.sh b/scripts/devenv-builder/configure-vm.sh
index ed8124be70..ae0fd5f489 100755
--- a/scripts/devenv-builder/configure-vm.sh
+++ b/scripts/devenv-builder/configure-vm.sh
@@ -136,7 +136,7 @@ if ${INSTALL_BUILD_DEPS} || ${BUILD_AND_RUN}; then
     if ${DNF_UPDATE}; then
         "${DNF_RETRY}" "update"
     fi
-    "${DNF_RETRY}" "install" "gcc git golang cockpit make jq selinux-policy-devel rpm-build jq bash-completion avahi-tools createrepo"
+    "${DNF_RETRY}" "install" "gcc gdb git golang cockpit make jq selinux-policy-devel rpm-build jq bash-completion avahi-tools createrepo"
     sudo systemctl enable --now cockpit.socket
 fi
 
diff --git a/scripts/devenv-builder/manage-vm.sh b/scripts/devenv-builder/manage-vm.sh
index c845c4c825..5a70a56bc5 100755
--- a/scripts/devenv-builder/manage-vm.sh
+++ b/scripts/devenv-builder/manage-vm.sh
@@ -63,7 +63,8 @@ function get_base_isofile {
 function action_config() {
     local -r deps="libvirt virt-manager virt-install virt-viewer libvirt-client qemu-kvm qemu-img sshpass"
     
-    "${SCRIPTDIR}/../dnf_retry.sh" "install" "${deps}"
+    "${SCRIPTDIR}/../dnf_retry.sh" "install"           "${deps}"
+    "${SCRIPTDIR}/../dnf_retry.sh" "debuginfo-install" "${deps}"
 
     if [ "$(systemctl is-active libvirtd.socket)" != "active" ] ; then
         echo "Enabling libvirtd"
diff --git a/test/bin/ci_phase_iso_boot.sh b/test/bin/ci_phase_iso_boot.sh
index 9c7e2ee1a2..05eca35385 100755
--- a/test/bin/ci_phase_iso_boot.sh
+++ b/test/bin/ci_phase_iso_boot.sh
@@ -59,6 +59,11 @@ if ${ENABLE_REGISTRY_MIRROR}; then
     bash -x ./bin/mirror_registry.sh
 fi
 
+# Enable edk2 debugging
+if [ -f /usr/share/qemu/firmware/52-edk2-aarch64-verbose-qcow2.json ] ; then
+    sudo cp -f /usr/share/qemu/firmware/52-edk2-aarch64-verbose-qcow2.json /usr/share/qemu/firmware/10-DEBUG-edk2-aarch64-verbose-qcow2.json
+fi
+
 # Show the summary of the output of the parallel jobs.
 if [ -t 0 ]; then
     progress="--progress"
diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh
index bb62790be8..d61e59cd66 100755
--- a/test/bin/scenario.sh
+++ b/test/bin/scenario.sh
@@ -510,13 +510,13 @@ launch_vm() {
         # exit after 1m, it sends the KILL signal to terminate the process.
         # Note: Using the '--wait <time>' virt-install options may not work for
         # failed installations when 'unbuffer' command is used.
-        local timeout_install="timeout -v --kill-after=1m ${VM_BOOT_TIMEOUT}s"
+        local timeout_install="timeout -v -s SIGUSR1 ${VM_BOOT_TIMEOUT}s"
         # When bash creates a background job (using `&`),
         # the bg job does not get its own TTY.
         # If the TTY is not provided, virt-install refuses
         # to attach to the console. `unbuffer` provides the TTY.
         # shellcheck disable=SC2086
-        if ! ${timeout_install} unbuffer sudo virt-install \
+        if ! unbuffer sudo virt-install \
             --autoconsole text \
             --graphics "${graphics_args}" \
             --name "${full_vmname}" \
@@ -530,7 +530,7 @@ launch_vm() {
             ${vm_fs_args} \
             --extra-args "${vm_extra_args}" \
             ${vm_initrd_inject} \
-            --wait ; then
+            --wait 20 ; then
 
             # Check if the command exited within 15s due to a failure
             local vm_create_end
@@ -557,6 +557,10 @@ launch_vm() {
         # the caller considers the script fully complete.
         # Note: this option is disabled automatically in interactive sessions
         # for easier troubleshooting of failed installations.
+        pid=$(sudo pgrep qemu -a | grep "${full_vmname}" | awk '{print $1}')
+        sudo pstack "${pid}"
+        sleep 15
+
         if [ ! -t 0 ] ; then
             sudo virsh destroy "${full_vmname}" || true
         fi