diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf
index ad709829ba4..6dc6443a857 100644
--- a/mkosi.conf.d/10-systemd.conf
+++ b/mkosi.conf.d/10-systemd.conf
@@ -15,6 +15,8 @@ CacheDirectory=mkosi.cache
 Acl=yes
 QemuMem=2G
 ExtraSearchPaths=build/
+# Make sure we don't trigger systemd-firstboot prompting for the root password.
+Credentials=passwd.plaintext-password.root=
 KernelCommandLineExtra=systemd.crash_shell
                        systemd.log_level=debug
                        systemd.log_ratelimit_kmsg=0
diff --git a/mkosi.presets/20-final/mkosi.conf b/mkosi.presets/20-final/mkosi.conf
index d15a17a1612..42fcb7d5825 100644
--- a/mkosi.presets/20-final/mkosi.conf
+++ b/mkosi.presets/20-final/mkosi.conf
@@ -34,5 +34,4 @@ Packages=
         zsh
 
 [Validation]
-Password=
 Autologin=yes