diff --git a/features.in/kernel/config.mk b/features.in/kernel/config.mk
index 62ec1682..e8cff97a 100644
--- a/features.in/kernel/config.mk
+++ b/features.in/kernel/config.mk
@@ -44,9 +44,12 @@ use/kernel/initrd-setup: use/kernel
 	@$(call add,VM_INITRDFEATURES,add-modules compress cleanup)
 	@$(call try,VM_FSTYPE,ext4)
 	@$(call add,VM_INITRDMODULES,$$(VM_FSTYPE))
-	@$(call add,VM_INITRDMODULES,ehci-pci ohci-pci uhci-hcd xhci-pci uas)
-	@$(call add,VM_INITRDMODULES,sdhci-pci xhci-plat-hcd dwc2)
+	@$(call add,VM_INITRDMODULES,ahci sd_mod)
+	@$(call add,VM_INITRDMODULES,nvme nvme-core)
+	@$(call add,VM_INITRDMODULES,ahci_platform ehci-pci ohci-pci uhci-hcd xhci-pci uas)
+	@$(call add,VM_INITRDMODULES,sdhci-acpi sdhci-pci xhci-plat-hcd dwc2 mmc_block)
 	@$(call add,VM_INITRDMODULES,usbhid)
+	@$(call add,VM_INITRDMODULES,evdev)
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call add,VM_INITRDMODULES,ata_piix)
 endif
@@ -61,14 +64,28 @@ endif
 ifeq (,$(filter-out ppc64le,$(ARCH)))
 	@$(call add,VM_INITRDMODULES,ipr ibmvscsi)
 endif
-ifeq (,$(filter-out i586 x86_64 aarch64 armh ppc64le,$(ARCH)))
-	@$(call add,VM_INITRDMODULES,ahci sd_mod)
-	@$(call add,VM_INITRDMODULES,nvme nvme-core)
-endif
 ifeq (,$(filter-out aarch64 armh,$(ARCH)))
-	@$(call add,VM_INITRDMODULES,ahci_platform)
 	@$(call add,VM_INITRDMODULES,bcm2835 sunxi-mmc)
 	@$(call add,VM_INITRDMODULES,nvmem_rockchip_efuse)
+	@$(call add,VM_INITRDMODULES,pwm-meson)
+	@$(call add,VM_INITRDMODULES,cb710-mmc mtk-sd tifm_sd usdhi6rol0 via-sdmmc)
+	@$(call add,VM_INITRDMODULES,mmc_spi of_mmc_spi toshsd ushc vub300)
+	@$(call add,VM_INITRDMODULES,smssdio sdio_uart armmmci.ko dw_mmc-pltfm dw_mmc-pci)
+	@$(call add,VM_INITRDMODULES,tifm_sd sdhci-msm toshsd ushc)
+	@$(call add,VM_INITRDMODULES,cqhci mmc_spi via-sdmmc dw_mmc-exynos)
+	@$(call add,VM_INITRDMODULES,sdhci-pltfm vub300 dw_mmc-k3)
+	@$(call add,VM_INITRDMODULES,sdhci-tegra sdhci-cadence sunxi-mmc dw_mmc-pci)
+	@$(call add,VM_INITRDMODULES,sdhci-iproc thunderx-mmc meson-gx-mmc)
+	@$(call add,VM_INITRDMODULES,nvme-fabrics nvme-rdma)
+	@$(call add,VM_INITRDMODULES,pci-stub aer_inject)
+	@$(call add,VM_INITRDMODULES,phy-sun4i-usb phy-sun6i-mipi-dphy phy-sun9i-usb)
+	@$(call add,VM_INITRDMODULES,phy-hi6220-usb phy-hisi-inno-usb2)
+	@$(call add,VM_INITRDMODULES,phy-rockchip-dp phy-rockchip-inno-usb2 phy-rockchip-usb)
+	@$(call add,VM_INITRDMODULES,phy-rockchip-emmc)
+	@$(call add,VM_INITRDMODULES,phy-rockchip-typec)
+	@$(call add,VM_INITRDMODULES,phy-exynos5-usbdrd phy-tegra-xusb phy-xgene)
+	@$(call add,VM_INITRDMODULES,meson-canvas mdt_loader)
+	@$(call add,VM_INITRDMODULES,usb_phy_generic)
 endif
 ifeq (,$(filter-out aarch64,$(ARCH)))
 	@$(call add,VM_INITRDMODULES,meson-gx-mmc)