diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 656f4555923..c65ab0a2a6f 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -143,14 +143,22 @@ jobs:
       env:
         SERENITY_KERNEL_CMDLINE: "boot_mode=self-test"
         SERENITY_RUN: "ci"
-      run: ninja run
+      run: |
+        echo "::group::ninja run # Qemu output"
+        run_worked=y
+        ninja run || run_worked=n
+        echo "::endgroup::"
+        echo "::group::cat debug.log # Serenity output"
+        if [ "y" = "${run_worked}" ] ; then
+          cat debug.log
+        else
+          echo "skipped (qemu had non-zero exit-code)"
+        fi
+        echo "::endgroup::"
+        [ "y" = ${run_worked} ]
       timeout-minutes: 10
       # FIXME: When stable, remove continue on error. (See issue #5541)
       continue-on-error: true
-    - name: Print target logs
-      if: ${{ !cancelled() && matrix.debug-macros == 'NORMAL_DEBUG'}}
-      working-directory: ${{ github.workspace }}/Build
-      run: cat ./debug.log
 
   build_and_test_lagom:
     runs-on: ${{ matrix.os }}