diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf
deleted file mode 100644
index 9ef1833a88..0000000000
--- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Environment=WITH_DEBUG=1
-
-[Match]
-Architecture=uefi
-
-[Content]
-VolatilePackages=
-        systemd-boot-debuginfo
diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
index 3743dd86b8..14a69456cd 100755
--- a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
@@ -125,6 +125,9 @@ if ! build; then
     build --noprep --nocheck
 fi
 
+# The %sysusers_generate_pre macro generates these and leaves them behind, clean them up
+rm -f systemd-network.pre systemd-resolve.pre
+
 cp "$BUILDDIR"/*.rpm "$PACKAGEDIR"
 
 make_sysext_unsigned /var/tmp/BUILD/*/BUILDROOT