diff --git a/lib/systemd/system/remove-system-map.service b/lib/systemd/system/remove-system-map.service
index 69dd333..fdfbf6b 100644
--- a/lib/systemd/system/remove-system-map.service
+++ b/lib/systemd/system/remove-system-map.service
@@ -1,10 +1,14 @@
 [Unit]
 Description=Removes the System.map files
 Documentation=https://github.com/Whonix/security-misc
+DefaultDependencies=no
+Before=sysinit.target
+Requires=local-fs.target
+After=local-fs.target
 
 [Service]
 Type=oneshot
 ExecStart=/usr/lib/security-misc/remove-system.map
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sysinit.target