diff --git a/etc/archboot/aarch64-latest.conf b/etc/archboot/aarch64-latest.conf
index 1d25a0c07..c0f4e2ef4 100644
--- a/etc/archboot/aarch64-latest.conf
+++ b/etc/archboot/aarch64-latest.conf
@@ -5,8 +5,9 @@
 #
 # Please change the hooks only if you know what you are doing.
 
-HOOKS=(archboot_common_modules archboot_base_common archboot_base_latest \
-archboot_installer_common archboot_net_common archboot_remote archboot_kexec archboot_licenses)
+HOOKS=(archboot_common_modules archboot_kms archboot_base_common \
+archboot_base_latest archboot_installer_common archboot_net_common \
+archboot_remote archboot_kexec archboot_licenses)
 
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
diff --git a/etc/archboot/aarch64-local.conf b/etc/archboot/aarch64-local.conf
index 4d5acdcce..75726bb47 100644
--- a/etc/archboot/aarch64-local.conf
+++ b/etc/archboot/aarch64-local.conf
@@ -5,7 +5,7 @@
 #
 # Please change the hooks only if you know what you are doing.
 
-HOOKS=(archboot_common_modules archboot_base_common \
+HOOKS=(archboot_common_modules archboot_kms archboot_base_common \
 archboot_base_latest archboot_installer_common archboot_kexec archboot_licenses \
 archboot_cache)
 
diff --git a/etc/archboot/aarch64-update_installer.conf b/etc/archboot/aarch64-update_installer.conf
index b0492510a..e9b762091 100644
--- a/etc/archboot/aarch64-update_installer.conf
+++ b/etc/archboot/aarch64-update_installer.conf
@@ -6,14 +6,15 @@
 # Please change the hooks only if you know what you are doing.
 
 HOOKS=(archboot_cache archboot_cache_cleanup archboot_firmware archboot_firmware_cleanup \
-archboot_common_modules archboot_block_modules archboot_base_common archboot_base_common_cleanup archboot_base \
-archboot_base_cleanup archboot_filesystems archboot_filesystems_cleanup archboot_net \
-archboot_net_cleanup archboot_acpi archboot_cpufreq archboot_devicemapper archboot_hypervisor \
-archboot_net_common archboot_platform archboot_wireless \
-archboot_installer_common archboot_installer archboot_installer_cleanup archboot_tz \
-archboot_keymap archboot_motd archboot_mdadm archboot_lvm2 archboot_remote archboot_kexec \
-archboot_efibootmgr archboot_pciutils archboot_usbutils archboot_smartmontools \
-archboot_licenses archboot_neovim archboot_secure_boot archboot_efivar archboot_lshw)
+archboot_common_modules archboot_block_modules archboot_kms archboot_base_common \
+archboot_base_common_cleanup archboot_base archboot_base_cleanup archboot_filesystems \
+archboot_filesystems_cleanup archboot_net archboot_net_cleanup archboot_acpi \
+archboot_cpufreq archboot_devicemapper archboot_hypervisor archboot_net_common \
+archboot_platform archboot_wireless archboot_installer_common archboot_installer \
+archboot_installer_cleanup archboot_tz archboot_keymap archboot_motd archboot_mdadm \
+archboot_lvm2 archboot_remote archboot_kexec archboot_efibootmgr archboot_pciutils \
+archboot_usbutils archboot_smartmontools archboot_licenses archboot_neovim \
+archboot_secure_boot archboot_efivar archboot_lshw)
 
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
diff --git a/etc/archboot/aarch64.conf b/etc/archboot/aarch64.conf
index 3f5e546fd..d703442ac 100644
--- a/etc/archboot/aarch64.conf
+++ b/etc/archboot/aarch64.conf
@@ -5,7 +5,7 @@
 #
 # Please change the hooks only if you know what you are doing.
 
-HOOKS=(archboot_firmware archboot_common_modules archboot_block_modules \
+HOOKS=(archboot_firmware archboot_common_modules archboot_kms archboot_block_modules \
 archboot_base_common archboot_base archboot_installer_common archboot_installer \
 archboot_tz archboot_keymap archboot_acpi archboot_motd archboot_net_common \
 archboot_net archboot_devicemapper archboot_mdadm archboot_lvm2 \
diff --git a/etc/archboot/riscv64.conf b/etc/archboot/riscv64.conf
index cf308049f..b9f94602e 100644
--- a/etc/archboot/riscv64.conf
+++ b/etc/archboot/riscv64.conf
@@ -5,7 +5,7 @@
 #
 # Please change the hooks only if you know what you are doing.
 
-HOOKS=(archboot_firmware archboot_common_modules archboot_block_modules \
+HOOKS=(archboot_firmware archboot_common_modules archboot_kms archboot_block_modules \
 archboot_base_common archboot_base archboot_installer_common archboot_installer \
 archboot_tz archboot_keymap archboot_acpi archboot_motd archboot_net_common \
 archboot_net archboot_devicemapper archboot_mdadm archboot_lvm2 \
diff --git a/etc/archboot/x86_64-latest.conf b/etc/archboot/x86_64-latest.conf
index 8204ea0da..40be7b8d8 100644
--- a/etc/archboot/x86_64-latest.conf
+++ b/etc/archboot/x86_64-latest.conf
@@ -5,7 +5,7 @@
 #
 # Please change the hooks only if you know what you are doing.
 
-HOOKS=(archboot_common_modules archboot_base_common \
+HOOKS=(archboot_common_modules archboot_kms archboot_base_common \
 archboot_base_latest archboot_installer_common archboot_net_common archboot_remote \
 archboot_kexec archboot_licenses)
 
diff --git a/etc/archboot/x86_64-local.conf b/etc/archboot/x86_64-local.conf
index 0c60c2f46..faf105d23 100644
--- a/etc/archboot/x86_64-local.conf
+++ b/etc/archboot/x86_64-local.conf
@@ -5,8 +5,9 @@
 #
 # Please change the hooks only if you know what you are doing.
 
-HOOKS=(archboot_common_modules archboot_base_common archboot_base_latest \
-archboot_installer_common archboot_kexec archboot_licenses archboot_cache)
+HOOKS=(archboot_common_modules archboot_kms archboot_base_common \
+archboot_base_latest archboot_installer_common archboot_kexec \
+archboot_licenses archboot_cache)
 
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
diff --git a/etc/archboot/x86_64-update_installer.conf b/etc/archboot/x86_64-update_installer.conf
index 06ae23244..a7e272626 100644
--- a/etc/archboot/x86_64-update_installer.conf
+++ b/etc/archboot/x86_64-update_installer.conf
@@ -6,15 +6,15 @@
 # Please change the hooks only if you know what you are doing.
 
 HOOKS=(archboot_cache archboot_cache_cleanup archboot_firmware archboot_firmware_cleanup \
-archboot_common_modules archboot_block_moduels archboot_base_common archboot_base_common_cleanup archboot_base \
-archboot_base_cleanup archboot_filesystems archboot_filesystems_cleanup archboot_net \
-archboot_net_cleanup archboot_acpi archboot_cpufreq archboot_devicemapper \
-archboot_hypervisor archboot_net_common archboot_dmidecode archboot_platform \
-archboot_wireless archboot_installer_common archboot_installer \
-archboot_installer_cleanup archboot_tz archboot_keymap archboot_motd archboot_mdadm \
-archboot_lvm2 archboot_remote archboot_kexec archboot_efibootmgr archboot_pciutils \
-archboot_usbutils archboot_smartmontools archboot_licenses archboot_neovim \
-archboot_secure_boot archboot_efivar archboot_lshw)
+archboot_common_modules archboot_block_modules archboot_kms archboot_base_common \
+archboot_base_common_cleanup archboot_base archboot_base_cleanup archboot_filesystems \
+archboot_filesystems_cleanup archboot_net archboot_net_cleanup archboot_acpi \
+archboot_cpufreq archboot_devicemapper archboot_hypervisor archboot_net_common \
+archboot_dmidecode archboot_platform archboot_wireless archboot_installer_common \
+archboot_installer archboot_installer_cleanup archboot_tz archboot_keymap \
+archboot_motd archboot_mdadm archboot_lvm2 archboot_remote archboot_kexec \
+archboot_efibootmgr archboot_pciutils archboot_usbutils archboot_smartmontools \
+archboot_licenses archboot_neovim archboot_secure_boot archboot_efivar archboot_lshw)
 
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
diff --git a/etc/archboot/x86_64.conf b/etc/archboot/x86_64.conf
index 9fec4f41f..96fe2baa1 100644
--- a/etc/archboot/x86_64.conf
+++ b/etc/archboot/x86_64.conf
@@ -5,7 +5,7 @@
 #
 # Please change the hooks only if you know what you are doing.
 
-HOOKS=(archboot_firmware archboot_common_modules archboot_block_modules \
+HOOKS=(archboot_firmware archboot_common_modules archboot_block_modules archboot_kms \
 archboot_base_common archboot_base archboot_installer_common archboot_installer \
 archboot_tz archboot_keymap archboot_acpi archboot_motd archboot_net_common \
 archboot_net archboot_devicemapper archboot_mdadm archboot_lvm2 \
diff --git a/usr/lib/initcpio/install/archboot_common_modules b/usr/lib/initcpio/install/archboot_common_modules
index 769794496..c2b941aa0 100644
--- a/usr/lib/initcpio/install/archboot_common_modules
+++ b/usr/lib/initcpio/install/archboot_common_modules
@@ -14,22 +14,12 @@ build ()
     add_module 'usbhid'
     add_all_modules -f 'parkbd' '/input/serio|keyboard/(applespi|atkbd)'
     add_all_modules -f '9pnet|bluetooth|fs' 'virtio'
-    # add firmware files and licenses
-    map add_full_dir "/lib/firmware/amdgpu" "/lib/firmware/i915" "/lib/firmware/nvidia" \
-        "/lib/firmware/radeon" "/usr/share/licenses/linux-firmware"
-    ### kmx modules
-    # AGP and DRM modules for GPUs
-    map add_all_modules '/drivers/char/agp/' '/drivers/gpu/drm/'
-    # modules that implement the privacy screen interface
-    # TODO: Replace with dynamic lookup of modules that depend on the drm_privacy_screen_register symbol
-    # See https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/issues/132
-    map add_all_modules 'chromeos_privacy_screen?' 'thinkpad_acpi?'
 }
 
 help ()
 {
 cat <<HELPEOF
-  This hook includes init, keyboard, kms and pcspkr support
+  This hook includes init, keyboard and pcspkr support
   for an archboot image.
   DO NOT remove this one unless you know what you're doing.
 HELPEOF
diff --git a/usr/lib/initcpio/install/archboot_kms b/usr/lib/initcpio/install/archboot_kms
new file mode 100644
index 000000000..6b502ecd6
--- /dev/null
+++ b/usr/lib/initcpio/install/archboot_kms
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-2.0-only
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+
+build ()
+{
+    # add firmware files and licenses
+    map add_full_dir "/lib/firmware/amdgpu" "/lib/firmware/i915" "/lib/firmware/nvidia" \
+        "/lib/firmware/radeon" "/usr/share/licenses/linux-firmware"
+    ### kmx modules
+    # AGP and DRM modules for GPUs
+    map add_all_modules '/drivers/char/agp/' '/drivers/gpu/drm/'
+    # modules that implement the privacy screen interface
+    # TODO: Replace with dynamic lookup of modules that depend on the drm_privacy_screen_register symbol
+    # See https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/issues/132
+    map add_all_modules 'chromeos_privacy_screen?' 'thinkpad_acpi?'
+}
+
+help ()
+{
+cat <<HELPEOF
+  This hook includes kms support for an archboot image.
+HELPEOF
+}
+# vim: set ft=sh ts=4 sw=4 et: