diff --git a/usr/lib/initcpio/install/archboot_base_arm b/usr/lib/initcpio/install/archboot_base_arm
index a4623d09d..7d3c679bb 100644
--- a/usr/lib/initcpio/install/archboot_base_arm
+++ b/usr/lib/initcpio/install/archboot_base_arm
@@ -229,8 +229,8 @@ build ()
     add_file "/etc/pacman.d/mirrorlist"
     # add pacman initialisation of gpg keys
     add_file "/usr/share/archboot/pacman/etc/systemd/system/etc-pacman.d-gnupg.mount" "/etc/systemd/system/etc-pacman.d-gnupg.mount"
-    add_file "/usr/share/archboot/pacman/etc/systemd/system/pacman-init.service" "/etc/systemd/system/pacman-init.service"
-    add_symlink "/etc/systemd/system/multi-user.target.wants/pacman-init.service" "/etc/systemd/system/pacman-init.service"
+    add_file "/usr/share/archboot/pacman/etc/systemd/system/pacman-init-arm.service" "/etc/systemd/system/pacman-init-arm.service"
+    add_symlink "/etc/systemd/system/multi-user.target.wants/pacman-init-arm.service" "/etc/systemd/system/pacman-init-arm.service"
     add_symlink "/etc/systemd/system/multi-user.target.wants/etc-pacman.d-gnupg.mount" "/etc/systemd/system/etc-pacman.d-gnupg.mount"
     add_full_dir "/usr/share/pacman/keyrings"
     add_full_dir "/usr/share/makepkg"
diff --git a/usr/share/archboot/pacman/etc/systemd/system/pacman-init-arm.service b/usr/share/archboot/pacman/etc/systemd/system/pacman-init-arm.service
new file mode 100644
index 000000000..f410d0fd2
--- /dev/null
+++ b/usr/share/archboot/pacman/etc/systemd/system/pacman-init-arm.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Initializes Pacman keyring
+Wants=haveged.service
+After=haveged.service
+Requires=etc-pacman.d-gnupg.mount
+After=etc-pacman.d-gnupg.mount
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/pacman-key --init
+ExecStart=/usr/bin/pacman-key --populate archlinuxarm
+
+[Install]
+WantedBy=multi-user.target