diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 7203a19c90..6e16f25edb 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -48,7 +48,7 @@ env:
   # Enable debug logging in systemd, but keep udev's log level to info,
   # since it's _very_ verbose in the QEMU task
   # Disable the ISC DHCP servers, as they are failing in Ubuntu
-  KERNEL_CMDLINE: "systemd.unit=mkosi-check-and-shutdown.service !quiet systemd.log_level=debug systemd.log_target=console udev.log_level=info systemd.default_standard_output=journal+console systemd.mask=isc-dhcp-server6.service systemd.mask=isc-dhcp-server.service"
+  KERNEL_CMDLINE: "systemd.unit=mkosi-check-and-shutdown.service !quiet systemd.log_level=debug systemd.log_target=console udev.log_level=info systemd.default_standard_output=journal+console"
 
 jobs:
   ci:
@@ -79,7 +79,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-    - uses: systemd/mkosi@c1924942d0daa64c4e546cda5616f6da6963def5
+    - uses: systemd/mkosi@e1dc08e53cf793a6b206ae4a2f99b6c76de00c37
 
     - name: Configure
       run: |
@@ -106,39 +106,13 @@ jobs:
       run: mkosi summary
 
     - name: Boot ${{ matrix.distro }} systemd-nspawn
-      run: |
-        STATUS=0
-        sudo strace -f -Z -o strace mkosi boot ${{ env.KERNEL_CMDLINE }} audit=0 || STATUS=$?
-        if [ $STATUS -ne 0 ]; then
-          cat strace
-        fi
-        exit $STATUS
-      env:
-        SYSTEMD_LOG_LEVEL: debug
+      run: sudo mkosi boot ${{ env.KERNEL_CMDLINE }} audit=0
 
     - name: Check ${{ matrix.distro }} systemd-nspawn
-      run: |
-        STATUS=0
-        sudo strace -f -Z -o strace mkosi shell bash -c "[[ -e /testok ]] || STATUS=$?"
-        if [ $STATUS -ne 0 ]; then
-          cat /failed-services
-          cat strace
-        fi
-        exit $STATUS
-      env:
-        SYSTEMD_LOG_LEVEL: debug
+      run: sudo mkosi shell bash -c "[[ -e /testok ]] || { cat /failed-services; exit 1; }"
 
     - name: Boot ${{ matrix.distro }} QEMU
       run: timeout -k 30 10m mkosi qemu
 
     - name: Check ${{ matrix.distro }} QEMU
-      run: |
-        STATUS=0
-        sudo strace -f -Z -o strace mkosi shell bash -c "[[ -e /testok ]] || STATUS=$?"
-        if [ $STATUS -ne 0 ]; then
-          cat /failed-services
-          cat strace
-        fi
-        exit $STATUS
-      env:
-        SYSTEMD_LOG_LEVEL: debug
+      run: sudo mkosi shell bash -c "[[ -e /testok ]] || { cat /failed-services; exit 1; }"
diff --git a/mkosi.extra/etc/systemd/system/mkosi-check-and-shutdown.sh b/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh
similarity index 100%
rename from mkosi.extra/etc/systemd/system/mkosi-check-and-shutdown.sh
rename to mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh
diff --git a/mkosi.extra/etc/systemd/system/mkosi-check-and-shutdown.service b/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service
similarity index 100%
rename from mkosi.extra/etc/systemd/system/mkosi-check-and-shutdown.service
rename to mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service