diff --git a/iso/builder/build-nvidia-module.sh b/iso/builder/build-nvidia-module.sh
index 8848210..2a7ef23 100644
--- a/iso/builder/build-nvidia-module.sh
+++ b/iso/builder/build-nvidia-module.sh
@@ -103,6 +103,7 @@ for ko in "$CACHE_DIR/modules/"*.ko; do
 done
 
 cp "$EXTRACT_DIR/nvidia-smi"         "$CACHE_DIR/bin/"
+cp "$EXTRACT_DIR/nvidia-bug-report.sh" "$CACHE_DIR/bin/" 2>/dev/null || true
 cp "$EXTRACT_DIR/libnvidia-ml.so."*  "$CACHE_DIR/lib/" 2>/dev/null || true
 # libcuda stub needed by nvidia-smi at runtime
 cp "$EXTRACT_DIR/libcuda.so."*       "$CACHE_DIR/lib/" 2>/dev/null || true
diff --git a/iso/builder/build.sh b/iso/builder/build.sh
index 63a66eb..d5fbf4a 100755
--- a/iso/builder/build.sh
+++ b/iso/builder/build.sh
@@ -128,6 +128,8 @@ cp "${NVIDIA_CACHE}/modules/"*.ko "${OVERLAY_KMOD_DIR}/"
 mkdir -p "${OVERLAY_DIR}/usr/local/bin" "${OVERLAY_DIR}/usr/lib"
 cp "${NVIDIA_CACHE}/bin/nvidia-smi" "${OVERLAY_DIR}/usr/local/bin/"
 chmod +x "${OVERLAY_DIR}/usr/local/bin/nvidia-smi"
+cp "${NVIDIA_CACHE}/bin/nvidia-bug-report.sh" "${OVERLAY_DIR}/usr/local/bin/" 2>/dev/null || true
+chmod +x "${OVERLAY_DIR}/usr/local/bin/nvidia-bug-report.sh" 2>/dev/null || true
 cp "${NVIDIA_CACHE}/lib/"* "${OVERLAY_DIR}/usr/lib/" 2>/dev/null || true
 
 
diff --git a/iso/overlay/usr/local/bin/bee-tui b/iso/overlay/usr/local/bin/bee-tui
index cd08942..96a3351 100755
--- a/iso/overlay/usr/local/bin/bee-tui
+++ b/iso/overlay/usr/local/bin/bee-tui
@@ -456,18 +456,13 @@ run_gpu_nvidia_acceptance_test() {
     c1="nvidia-smi -q"
     c2="dmidecode -t baseboard"
     c3="dmidecode -t system"
-    c4="nvidia-bug-report.sh"
+    c4="nvidia-bug-report.sh --output $run_dir/nvidia-bug-report.log"
 
     run_cmd_log "nvidia_smi_q" "$c1" "$run_dir/01-nvidia-smi-q.log"; rc1=$?
     run_cmd_log "dmidecode_baseboard" "$c2" "$run_dir/02-dmidecode-baseboard.log"; rc2=$?
     run_cmd_log "dmidecode_system" "$c3" "$run_dir/03-dmidecode-system.log"; rc3=$?
     run_cmd_log "nvidia_bug_report" "$c4" "$run_dir/04-nvidia-bug-report.log"; rc4=$?
 
-    bug_report="$(ls -1 nvidia-bug-report.log.gz 2>/dev/null | head -n1 || true)"
-    if [ -n "$bug_report" ] && [ -f "$bug_report" ]; then
-        cp -f "$bug_report" "$run_dir/"
-    fi
-
     {
         echo "run_at_utc=$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
         echo "cmd_nvidia_smi_q_rc=$rc1"