diff --git a/mkosi.conf.d/20-debian-ubuntu.conf b/mkosi.conf.d/20-debian-ubuntu/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/20-debian-ubuntu.conf
rename to mkosi.conf.d/20-debian-ubuntu/mkosi.conf
diff --git a/mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/systemd/system-preset/99-ignore.preset b/mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/systemd/system-preset/99-ignore.preset
new file mode 100644
index 00000000000..43f25533d1d
--- /dev/null
+++ b/mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/systemd/system-preset/99-ignore.preset
@@ -0,0 +1 @@
+ignore *
diff --git a/mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/tmpfiles.d/locale.conf b/mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/tmpfiles.d/locale.conf
new file mode 100644
index 00000000000..e1a8e8171ac
--- /dev/null
+++ b/mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/tmpfiles.d/locale.conf
@@ -0,0 +1 @@
+L /etc/default/locale - - - - ../locale.conf
diff --git a/mkosi.postinst b/mkosi.postinst
index a71878b9397..82c23cf87a6 100755
--- a/mkosi.postinst
+++ b/mkosi.postinst
@@ -63,11 +63,6 @@ if [ -n "$IMAGE_VERSION" ] ; then
         /usr/lib/os-release
 fi
 
-# Install a default ignore preset on Debian until it is shipped by Debian itself.
-if grep -q -e "ID=debian" -e "ID_LIKE=debian" /etc/os-release; then
-    echo "ignore *" >/usr/lib/systemd/system-preset/99-ignore.preset
-fi
-
 if command -v authselect >/dev/null; then
     authselect select minimal
 
@@ -75,3 +70,6 @@ if command -v authselect >/dev/null; then
         authselect enable-feature with-homed
     fi
 fi
+
+# Let tmpfiles.d/systemd-resolve.conf handle the symlink
+rm -f /etc/resolv.conf