diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl
index 14400e88..2166a899 100644
--- a/share/runtime-postinstall.tmpl
+++ b/share/runtime-postinstall.tmpl
@@ -22,7 +22,7 @@ move etc/yum.repos.d etc/anaconda.repos.d
 remove etc/systemd/system/default.target
 remove etc/systemd/system/default.target.wants/*
 symlink /lib/systemd/system/anaconda.target etc/systemd/system/default.target
-## remove unwanted systemd services
+## remove/disable unwanted systemd services
 removefrom systemd-units /lib/systemd/system/kexec*
 removefrom systemd-units /lib/systemd/system/local-fs.target.wants/media.mount
 removefrom systemd-units /lib/systemd/system/media.mount
@@ -30,7 +30,7 @@ removefrom systemd-units /lib/systemd/system/*plymouth*
 removefrom systemd-units /lib/systemd/system/quota*.service
 removefrom systemd-units /lib/systemd/system/systemd-remount-api-vfs.service
 removefrom ConsoleKit /lib/systemd/system/*
-removefrom initscripts /lib/systemd/system/fedora* /lib/systemd/fedora*
+removefrom initscripts /lib/systemd/system/local-fs.target.wants/fedora-storage* /lib/systemd/system/basic.target.wants/*
 removefrom lvm2 /lib/systemd/system/*
 removefrom mdadm /lib/systemd/system/*