diff --git a/mkosi.conf.d/fedora/mkosi.conf b/mkosi.conf.d/fedora/mkosi.conf
index 66f2d4d8..1691dbbe 100644
--- a/mkosi.conf.d/fedora/mkosi.conf
+++ b/mkosi.conf.d/fedora/mkosi.conf
@@ -15,6 +15,7 @@ Packages=
         dnf5
         fido2-tools
         git-core
+        hostname
         integritysetup
         iproute
         iproute-tc
diff --git a/mkosi.extra/usr/lib/tmpfiles.d/etc.conf b/mkosi.extra/usr/lib/tmpfiles.d/etc.conf
index 697a146b..bc44778a 100644
--- a/mkosi.extra/usr/lib/tmpfiles.d/etc.conf
+++ b/mkosi.extra/usr/lib/tmpfiles.d/etc.conf
@@ -63,5 +63,11 @@ L? /etc/alternatives
 # PackageKit does not run without /etc/PackageKit/ and GNOME stalls
 # logout/reboot if it doesn't run.
 L? /etc/PackageKit
-# ModemManager needds its dbus policy file
-L? /etc/dbus1/systemd.d/org.freedesktop.ModemManager1.conf
+# ModemManager/WPASupplicant/Flatpak need their dbus policy files
+L? /etc/dbus-1/system.d/org.freedesktop.ModemManager1.conf
+L? /etc/dbus-1/system.d/wpa_supplicant.conf
+L? /etc/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf
+# WPASupplicant also needs its configuration
+L? /etc/wpa_supplicant/wpa_supplicant.conf
+# Make sure flatpak's XDG_DATA_DIR integration works
+L? /etc/profile.d/flatpak.sh
diff --git a/mkosi.profiles/desktop/mkosi.conf.d/fedora/mkosi.conf b/mkosi.profiles/desktop/mkosi.conf.d/fedora/mkosi.conf
index 5fc2dc7f..076279a9 100644
--- a/mkosi.profiles/desktop/mkosi.conf.d/fedora/mkosi.conf
+++ b/mkosi.profiles/desktop/mkosi.conf.d/fedora/mkosi.conf
@@ -10,17 +10,19 @@ Packages=
         alsa-sof-firmware
         amd-gpu-firmware
         fedora-logos
+        glibc-all-langpacks
         glx-utils
-        kernel-modules
+        google-noto-fonts-all
         iwlwifi-mvm-firmware
+        kernel-modules
         linux-firmware
         mesa-dri-drivers
         mesa-vulkan-drivers
         ModemManager
-        nvidia-gpu-firmware
         NetworkManager
+        NetworkManager-wifi
+        nvidia-gpu-firmware
         pipewire-pulseaudio
         steam-devices
         tuned-ppd
-        google-noto-fonts-all
         wpa_supplicant
diff --git a/mkosi.profiles/gnome/mkosi.conf.d/debian/mkosi.conf b/mkosi.profiles/gnome/mkosi.conf.d/debian/mkosi.conf
index fc78148d..93c87d35 100644
--- a/mkosi.profiles/gnome/mkosi.conf.d/debian/mkosi.conf
+++ b/mkosi.profiles/gnome/mkosi.conf.d/debian/mkosi.conf
@@ -12,3 +12,4 @@ Packages=
         gnome-session-xsession
         gnome-software-plugin-flatpak
         gnome-software-plugin-fwupd
+        pinentry-gnome3
diff --git a/mkosi.profiles/gnome/mkosi.conf.d/fedora/mkosi.conf b/mkosi.profiles/gnome/mkosi.conf.d/fedora/mkosi.conf
index cfca1eec..f7a1e649 100644
--- a/mkosi.profiles/gnome/mkosi.conf.d/fedora/mkosi.conf
+++ b/mkosi.profiles/gnome/mkosi.conf.d/fedora/mkosi.conf
@@ -6,7 +6,8 @@ Distribution=fedora
 [Content]
 Packages=
         adwaita-fonts-all
+        default-fonts-core-emoji
         gdm
+        pinentry-gnome3
         rsms-inter-fonts
         rsms-inter-vf-fonts
-        default-fonts-core-emoji