diff --git a/features.in/kernel/config.mk b/features.in/kernel/config.mk
index f6f5f0c5..646ba48d 100644
--- a/features.in/kernel/config.mk
+++ b/features.in/kernel/config.mk
@@ -48,14 +48,16 @@ use/kernel/server:
 use/kernel/initrd-setup: use/kernel
 	@$(call try,VM_FSTYPE,ext4)
 	@$(call add,VM_INITRDMODULES,$$(VM_FSTYPE))
-	@$(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 sdhci-pltfm xhci-plat-hcd dwc2 mmc_block)
-	@$(call add,VM_INITRDMODULES,usbhid)
-	@$(call add,VM_INITRDMODULES,evdev)
+	@$(call add,VM_INITRDMODULES,ahci.ko ahci_platform.ko sd_mod.ko)
+	@$(call add,VM_INITRDMODULES,usbhid.ko usbkbd.ko)
+	@$(call add,VM_INITRDMODULES,evdev.ko)
+	@$(call add,VM_INITRDMODULES,drivers/pci)
+	@$(call add,VM_INITRDMODULES,drivers/mmc drivers/usb/host)
+	@$(call add,VM_INITRDMODULES,drivers/usb/storage drivers/nvmem)
+	@$(call add,VM_INITRDMODULES,drivers/virtio)
+	@$(call add,VM_INITRDMODULES,drm/virtio)
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
-	@$(call add,VM_INITRDMODULES,ata_piix)
+	@$(call add,VM_INITRDMODULES,ata_piix.ko)
 endif
 ifeq (,$(filter-out i586 x86_64 aarch64 armh e2k% ppc64le mipsel,$(ARCH)))
 	@$(call add,VM_INITRDFEATURES,usb)
@@ -63,46 +65,16 @@ endif
 ifneq (,$(filter-out e2k% riscv64 mipsel,$(ARCH)))
 	@$(call add,VM_INITRDFEATURES,qemu)
 endif
-	@$(call add,VM_INITRDMODULES,virtio-scsi virtio-blk virtio-rng virtio_net virtio-gpu)
-	@$(call add,VM_INITRDMODULES,virtio-mmio virtio_pci virtio_console virtio_input)
 ifeq (,$(filter-out ppc64le,$(ARCH)))
-	@$(call add,VM_INITRDMODULES,ipr ibmvscsi)
+	@$(call add,VM_INITRDMODULES,ipr.ko ibmvscsi.ko)
 endif
 ifeq (,$(filter-out aarch64 armh,$(ARCH)))
-	@$(call add,VM_INITRDMODULES,bcm2835 bcm2835-dma sunxi-mmc)
-	@$(call add,VM_INITRDMODULES,reset_raspberrypi)
-	@$(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,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)
-	@$(call add,VM_INITRDMODULES,nvmem_meson_efuse)
-	@$(call add,VM_INITRDMODULES,pcie-rockchip-host phy-rockchip-pcie)
-	@$(call add,VM_INITRDMODULES,rk808 i2c-rk3x sdhci-of-arasan sdhci)
-	@$(call add,VM_INITRDMODULES,dw_mmc dw_mmc-rockchip phy-rockchip-emmc)
-	@$(call add,VM_INITRDMODULES,pinctrl-rk805 rockchip-io-domain)
-	@$(call add,VM_INITRDMODULES,pwm-rockchip rk808-regulator)
-endif
-ifeq (,$(filter-out armh,$(ARCH)))
-	@$(call add,VM_INITRDMODULES,sdhci_dove sdhci_esdhc_imx)
+	@$(call add,VM_INITRDMODULES,drivers/dma drivers/reset)
+	@$(call add,VM_INITRDMODULES,drivers/usb/dwc2 drivers/usb/dwc3)
+	@$(call add,VM_INITRDMODULES,drivers/phy drivers/usb/phy)
+	@$(call add,VM_INITRDMODULES,drivers/bus)
+	@$(call add,VM_INITRDMODULES,drivers/pwm drivers/regulator)
+	@$(call add,VM_INITRDMODULES,drivers/rtc drivers/i2c)
 endif
 	@$(call xport,VM_INITRDMODULES)
 	@$(call xport,VM_INITRDFEATURES)