diff --git a/.ci/env/apt.sh b/.ci/env/apt.sh
index 33d53adfc21..4cf901d5d49 100755
--- a/.ci/env/apt.sh
+++ b/.ci/env/apt.sh
@@ -59,36 +59,11 @@ function install_qemu_emulation_apt {
 }
 
 function install_qemu_emulation_deb {
-    set +e
-
-    versions=(9.0.2 9.0.1 8.2.4)
-    suffixes=("" "~bpo12+1")
-    found_version=""
-    for version in ${versions[@]}; do
-        for suffix in ${suffixes[@]}; do
-            qemu_deb="qemu-user-static_${version}+ds-1${suffix}_amd64.deb"
-            echo "Checking for http://ftp.debian.org/debian/pool/main/q/qemu/${qemu_deb}"
-            if wget -q --method=HEAD http://ftp.debian.org/debian/pool/main/q/qemu/${qemu_deb} &> /dev/null;
-            then
-                echo "Found qemu version ${version}"
-                found_version=${qemu_deb}
-                break 2
-            fi
-        done
-    done
-
-    set -eo pipefail
-    if [[ -z "${found_version}" ]] ; then
-        # If nothing is found, error out and fail
-        echo "None of the requested qemu versions ${versions[*]} are available."
-        false
-    fi
-
+    # get last version of qemu listed on debian, changes may need to occur to this with version 10 of qemu
+    found_version=$(wget -q http://ftp.debian.org/debian/pool/main/q/qemu/ -O - | grep -oP "(?<=\")$1_.*_amd64.deb(?=\")" | tail -1)
     wget http://ftp.debian.org/debian/pool/main/q/qemu/${found_version}
     sudo dpkg -i ${found_version}
-
     sudo systemctl restart systemd-binfmt.service
-    set +eo pipefail
 }
 
 function install_llvm_version {
@@ -140,7 +115,9 @@ elif [ "${component}" == "qemu-apt" ]; then
     install_qemu_emulation_apt
 elif [ "${component}" == "qemu-deb" ]; then
     update
-    install_qemu_emulation_deb
+    install_qemu_emulation_deb qemu-user
+    install_qemu_emulation_deb qemu-user-binfmt
+    install_qemu_emulation_deb qemu-user-static
 elif [ "${component}" == "llvm-version" ] ; then
     update
     install_llvm_version "$2"
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 0b136649faa..f684a9609bb 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -19,11 +19,27 @@ name: Nightly-build
 on:
   schedule:
     - cron: '0 21 * * *'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - .github/workflows/nightly-build.yml
+      - .ci/pipeline/ci.yml
+      - makefile
+      - '.ci/env/**'
+      - '.ci/scripts/**'
+      - 'dev/make/**'
+      - 'dev/make/compiler_definitions/**'
+      - 'dev/make/function_definitions/**'
   workflow_dispatch:
 
 permissions:
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name }}-${{ github.event.number || github.sha }}
+  cancel-in-progress: true
+
 env:
   WINDOWS_ALL_COMPONENTS: 'intel.oneapi.win.cpp-dpcpp-common:intel.oneapi.win.mkl.devel:intel.oneapi.win.tbb.devel'
 
diff --git a/dev/make/compiler_definitions/dpcpp.mk b/dev/make/compiler_definitions/dpcpp.mk
index 19b7234bc6c..eea7c8fc5e4 100644
--- a/dev/make/compiler_definitions/dpcpp.mk
+++ b/dev/make/compiler_definitions/dpcpp.mk
@@ -25,7 +25,7 @@ CMPLRDIRSUFF.dpcpp = _dpcpp
 
 CORE.SERV.COMPILER.dpcpp = generic
 
--Zl.dpcpp = $(if $(OS_is_win),-Zl,) $(-Q)no-intel-lib
+-Zl.dpcpp = $(if $(OS_is_win),-Zl -Q,-)no-intel-lib
 -DEBC.dpcpp = $(if $(OS_is_win),-debug:all -Z7,-g) -fno-system-debug
 
 COMPILER.lnx.dpcpp = icpx -fsycl -m64 -stdlib=libstdc++ -fgnu-runtime -fwrapv \