diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index d14746f1ed..472064e45d 100644
--- a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -8,10 +8,6 @@ Distribution=|ubuntu
 PackageManagerTrees=mkosi-pinning.pref:/etc/apt/preferences.d/mkosi-pinning.pref
 
 [Content]
-# Debian ships /usr/bin/login from shadow instead of util-linux which doesn't support credentials so we
-# enable autologin the old-fashioned way.
-Autologin=yes
-
 VolatilePackages=
         libnss-myhostname
         libnss-mymachines
@@ -58,6 +54,7 @@ Packages=
         knot
         libcap-ng-utils
         locales
+        login
         man-db
         multipath-tools
         ncat
diff --git a/mkosi.conf.d/10-ubuntu/mkosi.conf b/mkosi.conf.d/10-ubuntu/mkosi.conf
index 1ffa3ab031..73faafe6c0 100644
--- a/mkosi.conf.d/10-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/10-ubuntu/mkosi.conf
@@ -8,6 +8,9 @@ Release=noble
 Repositories=universe
 
 [Content]
+# Ubuntu ships /usr/bin/login from shadow instead of util-linux which doesn't support credentials so we
+# enable autologin the old-fashioned way.
+Autologin=yes
 Packages=
         linux-image-generic
         linux-tools-common