diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 58d156cc..a479b3ae 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -30,7 +30,9 @@ removefrom ${product.name}-logos /usr/share/plymouth/*
 ## (that happens inside the target system after we install dracut/grubby)
 removepkg dracut-network grubby anaconda-dracut
 ## In order to execute the /usr move on upgrades we need convertfs from dracut
-removefrom dracut --allbut /usr/lib/dracut/modules.d/30convertfs/convertfs.sh
+## We also need dracut-shutdown.service and dracut-initramfs-restore to reboot
+removefrom dracut --allbut /usr/lib/dracut/modules.d/30convertfs/convertfs.sh \
+                  /usr/lib/systemd/* /usr/lib/dracut/dracut-initramfs-restore
 ## we don't run SELinux (not in enforcing, anyway)
 removepkg checkpolicy selinux-policy libselinux-utils
 ## anaconda has its own repo files
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index 568f7998..85057d34 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -7,6 +7,8 @@ installpkg anaconda anaconda-widgets
 installpkg tmux
 installpkg firstboot
 installpkg iscsi-initiator-utils
+## speed up compression on multicore systems
+installpkg pigz
 
 ## firstaidkit (rescue mode) packages
 installpkg firstaidkit-plugin-{passwd,key-recovery,mdadm-conf}