diff --git a/archiso/install/archiso b/archiso/install/archiso
index d32c8ab..0bb0d0f 100644
--- a/archiso/install/archiso
+++ b/archiso/install/archiso
@@ -1,10 +1,6 @@
 build ()
 {
-    MODULES="cdrom ide-cd_mod ide-core ide-generic loop dm-mod dm-snapshot squashfs isofs $(all_modules '/kernel/fs' | grep -v "nls")"
-    MODULES="${MODULES} $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811_hcd" -e "isp116x_hcd")"
-    MODULES="${MODULES} usb_storage sd_mod sr_mod"
-    MODULES="${MODULES} virtio_pci virtio_blk"
-    MODULES=$(echo ${MODULES}) #trim whitespace
+    MODULES="cdrom loop dm-snapshot"
 
     BINARIES=""
     FILES=""
diff --git a/configs/baseline/mkinitcpio.conf b/configs/baseline/mkinitcpio.conf
index 389ec51..a1aafa8 100644
--- a/configs/baseline/mkinitcpio.conf
+++ b/configs/baseline/mkinitcpio.conf
@@ -1,2 +1,2 @@
-HOOKS="base udev archiso sata filesystems"
+HOOKS="base udev archiso virtio filesystems"
 COMPRESSION="xz"
diff --git a/configs/releng/mkinitcpio.conf b/configs/releng/mkinitcpio.conf
index f6b846c..72e6b2a 100644
--- a/configs/releng/mkinitcpio.conf
+++ b/configs/releng/mkinitcpio.conf
@@ -1,2 +1,2 @@
-HOOKS="base udev memdisk archiso_shutdown archiso archiso_pxe_nbd archiso_loop_mnt pata scsi sata usb fw pcmcia filesystems usbinput"
+HOOKS="base udev memdisk archiso_shutdown archiso archiso_pxe_nbd archiso_loop_mnt pata scsi sata virtio usb fw pcmcia filesystems usbinput"
 COMPRESSION="xz"