diff --git a/archiso/airootfs/etc/systemd/system/pacman-init.service b/archiso/airootfs/etc/systemd/system/pacman-init.service
index 9ad2e69..509a535 100644
--- a/archiso/airootfs/etc/systemd/system/pacman-init.service
+++ b/archiso/airootfs/etc/systemd/system/pacman-init.service
@@ -1,9 +1,10 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 [Unit]
 Description=Initializes Pacman keyring
-Requires=etc-pacman.d-gnupg.mount
-After=etc-pacman.d-gnupg.mount
-BindsTo=etc-pacman.d-gnupg.mount
-Before=archlinux-keyring-wkd-sync.service
+Wants=haveged.service
+After=haveged.service
 
 [Service]
 Type=oneshot
diff --git a/archiso/packages_gnome.x86_64 b/archiso/packages_gnome.x86_64
index 83b9985..ad028a6 100644
--- a/archiso/packages_gnome.x86_64
+++ b/archiso/packages_gnome.x86_64
@@ -105,6 +105,7 @@ 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 a29ed91..732cc65 100644
--- a/archiso/packages_kde.x86_64
+++ b/archiso/packages_kde.x86_64
@@ -71,6 +71,7 @@ gptfdisk
 grsync
 grub
 gtkmm3
+haveged
 hdparm
 hwinfo
 hyperv