diff --git a/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/00-session.conf b/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/00-session.conf
index d3b0738fd..74cd2d3c6 100644
--- a/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/00-session.conf
+++ b/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/00-session.conf
@@ -2,5 +2,5 @@ u lightdm - "Light Display Manager" /var/lib/lightdm /usr/sbin/nologin
 u geoclue - "Geoclue Service" /var/lib/geoclue /usr/sbin/nologin
 g messagebus 987
 u messagebus 987:987 "System Message Bus" /nonexistent /usr/sbin/nologin
-u     speech-dispatcher -   "Speech Dispatcher"      /var/run/speech-dispatcher /sbin/nologin
+u     speech-dispatcher -   "Speech Dispatcher"      /run/speech-dispatcher /sbin/nologin
 g     speech-dispatcher -   -                        -                       -
diff --git a/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/00-nsswitch.conf b/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/00-nsswitch.conf
new file mode 100644
index 000000000..6631c41fc
--- /dev/null
+++ b/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/00-nsswitch.conf
@@ -0,0 +1,2 @@
+# Override debian.conf to symlink instead of copy to get updates when they appear upstream.
+L /etc/nsswitch.conf
diff --git a/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/etc.conf b/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/etc.conf
index 63d58cdd9..a44a8ce51 100644
--- a/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/etc.conf
+++ b/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/etc.conf
@@ -29,7 +29,6 @@ L /etc/ld.so.conf
 L /etc/ld.so.conf.d
 # Contains the default systemd locale
 L /etc/locale.conf
-L /etc/nsswitch.conf
 
 # ID
 C /etc/passwd
diff --git a/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/var.conf b/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/var.conf
index 91f1c1e06..073794975 100644
--- a/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/var.conf
+++ b/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/var.conf
@@ -1,3 +1,3 @@
-d     /var/spool/anacron  0755 root root -   -
-d     /var/spool/rsyslog  0755 root root -   -
-d     /var/run/speech-dispatcher   0755 speech-dispatcher speech-dispatcher -   -
+# This overrides the same file from systemd.
+L+ /var/run - - - - ../run
+d /var/spool/anacron 0755 root root -