diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 11089fdf..6c596b97 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -94,7 +94,7 @@ removekmod sound drivers/media drivers/hwmon \
 ## Also keep virtio-rng so that the installer can get sufficient randomness for
 ## LUKS setup.
 removekmod drivers/char --allbut virtio_console hw_random \
-                                  virtio-rng ipmi
+                                  virtio-rng ipmi hmcdrv
 removekmod drivers/staging --allbut zram
 removekmod drivers/video --allbut hyperv_fb syscopyarea sysfillrect sysimgblt fb_sys_fops
 remove lib/modules/*/{build,source,*.map}
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index c52698fd..158314fc 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -46,7 +46,7 @@ installpkg kernel
 %endif
 
 %if basearch == "s390x":
-    installpkg lsscsi s390utils-base s390utils-cmsfs-fuse
+    installpkg lsscsi s390utils-base s390utils-cmsfs-fuse s390utils-hmcdrvfs
 %endif
 
 ## yay, plymouth