diff --git a/etc/archboot/defaults b/etc/archboot/defaults
index b2a77d495..b98566dde 100644
--- a/etc/archboot/defaults
+++ b/etc/archboot/defaults
@@ -17,10 +17,11 @@ _XFCE_PACKAGES="xorg xfce4 breeze-icons gvfs gvfs-smb thunar-archive-plugin file
 ### GNOME defaults
 # GNOME packages
 _GNOME_PACKAGES="xorg gnome-shell gnome-terminal gnome-control-center nautilus gvfs-smb gthumb file-roller gedit"
-_GNOME_WAYLAND_PACKAGES="gnome-shell gnome-terminal gnome-control-center nautilus gvfs-smb gthumb file-roller gedit"
+_GNOME_WAYLAND_PACKAGES="egl-wayland gnome-shell gnome-terminal gnome-control-center nautilus gvfs-smb gthumb file-roller gedit"
 ### KDE defaults
 # KDE/Plasma packages
 _KDE_PACKAGES="xorg plasma-desktop konsole kscreen kate dolphin powerdevil ark gwenview"
+_KDE_WAYLAND_PACKAGES="plasma-wayland-session egl-wayland plasma-desktop konsole kscreen kate dolphin powerdevil ark gwenview"
 ### Custom X defaults
 # Custom packages
 _CUSTOM_XORG=""
diff --git a/usr/share/archboot/base/etc/systemd/system/pacman-init.service b/usr/share/archboot/base/etc/systemd/system/pacman-init.service
index a7a6ff73c..61a740d09 100644
--- a/usr/share/archboot/base/etc/systemd/system/pacman-init.service
+++ b/usr/share/archboot/base/etc/systemd/system/pacman-init.service
@@ -1,7 +1,5 @@
 [Unit]
 Description=Initializes Pacman keyring
-Wants=haveged.service
-After=haveged.service
 
 [Service]
 Type=oneshot