diff --git a/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/session.conf b/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/00-session.conf
similarity index 60%
rename from mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/session.conf
rename to mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/00-session.conf
index 044dca4b5..5e25124dc 100644
--- a/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/session.conf
+++ b/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/00-session.conf
@@ -1,2 +1,4 @@
 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
diff --git a/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/05-net.conf b/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/05-net.conf
new file mode 100644
index 000000000..6cb071fcd
--- /dev/null
+++ b/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/05-net.conf
@@ -0,0 +1,4 @@
+g netdev - -
+g lpadmin - -
+u cups-pk-helper - "cups-pk-helper daemon" /nonexistent /usr/sbin/nologin
+m cups-pk-helper lpadmin
diff --git a/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/wpa.conf b/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/wpa.conf
deleted file mode 100644
index 4f28f9b46..000000000
--- a/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/wpa.conf
+++ /dev/null
@@ -1 +0,0 @@
-g netdev - -
diff --git a/mkosi.images/base/mkosi.postinst.chroot b/mkosi.images/base/mkosi.postinst.chroot
index 79961fd97..da0755a07 100755
--- a/mkosi.images/base/mkosi.postinst.chroot
+++ b/mkosi.images/base/mkosi.postinst.chroot
@@ -6,4 +6,10 @@ set -euo pipefail
 ln -sf /dev/null /usr/lib/systemd/system/systemd-firstboot.service
 ln -sf /dev/null /usr/lib/systemd/system/systemd-networkd-wait-online.service
 
+
+# Change dbus-daemon-launch-helper group to something normal (In the non-existant render group by default)
+systemd-sysusers
+chown root:987 /usr/lib/dbus-1.0/dbus-daemon-launch-helper
+chmod 4754 /usr/lib/dbus-1.0/dbus-daemon-launch-helper
+
 systemctl enable preset-global.service