diff --git a/mkosi.extra/usr/lib/sysupdate.d/60-esp.conf b/mkosi.extra/usr/lib/sysupdate.d/60-esp.conf
index 93a7016..a06e7ed 100644
--- a/mkosi.extra/usr/lib/sysupdate.d/60-esp.conf
+++ b/mkosi.extra/usr/lib/sysupdate.d/60-esp.conf
@@ -11,7 +11,8 @@ MatchPattern=kde-linux_@v.efi
 
 [Target]
 Type=regular-file
-Path=/efi/EFI/Linux
+Path=/EFI/Linux
+PathRelativeTo=boot
 # Keep matching kdeos so the old images get cleaned up.
 MatchPattern=kde-linux_@v+@l-@d.efi \
              kde-linux_@v+@l.efi \
diff --git a/mkosi.finalize.chroot b/mkosi.finalize.chroot
index c3dacd3..88453a5 100755
--- a/mkosi.finalize.chroot
+++ b/mkosi.finalize.chroot
@@ -78,9 +78,11 @@ rm -rf \
 rm -rf \
     /usr/share/doc/
 
-## /boot is not necessary. We've already created our initrd.
+## /boot is now the preferred mount point for systemd and BLS:
+## https://uapi-group.org/specifications/specs/boot_loader_specification/#mount-points
+## However, its content are no longer necessary, since we've already created our initrd.
 # shellcheck disable=SC2114
-rm -rf /boot
+rm -rf /boot/*
 
 ## Not sure where this comes from, but it's not useful.
 rm -rf /.cache