diff --git a/archiso/airootfs/etc/systemd/system/pacman-init.service b/archiso/airootfs/etc/systemd/system/pacman-init.service
index 509a535..9ad2e69 100644
--- a/archiso/airootfs/etc/systemd/system/pacman-init.service
+++ b/archiso/airootfs/etc/systemd/system/pacman-init.service
@@ -1,10 +1,9 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Unit]
 Description=Initializes Pacman keyring
-Wants=haveged.service
-After=haveged.service
+Requires=etc-pacman.d-gnupg.mount
+After=etc-pacman.d-gnupg.mount
+BindsTo=etc-pacman.d-gnupg.mount
+Before=archlinux-keyring-wkd-sync.service
 
 [Service]
 Type=oneshot
diff --git a/archiso/packages_gnome.x86_64 b/archiso/packages_gnome.x86_64
index ad028a6..83b9985 100644
--- a/archiso/packages_gnome.x86_64
+++ b/archiso/packages_gnome.x86_64
@@ -105,7 +105,6 @@ gst-plugins-bad
 gst-plugins-ugly
 gtk-engine-murrine
 gtk3
-haveged
 hdparm
 hwdetect
 hwinfo
diff --git a/archiso/packages_kde.x86_64 b/archiso/packages_kde.x86_64
index 3f83021..ca1dc31 100644
--- a/archiso/packages_kde.x86_64
+++ b/archiso/packages_kde.x86_64
@@ -71,7 +71,6 @@ gptfdisk
 grsync
 grub
 gtkmm3
-haveged
 hdparm
 hwinfo
 hyperv