diff --git a/units/soft-reboot.target b/units/soft-reboot.target
index 4bca192454..6a6c772875 100644
--- a/units/soft-reboot.target
+++ b/units/soft-reboot.target
@@ -11,10 +11,8 @@
 Description=Reboot System Userspace
 Documentation=man:systemd.special(7)
 DefaultDependencies=no
-Requires=shutdown.target umount.target final.target
-After=shutdown.target umount.target final.target
 Requires=systemd-soft-reboot.service
-Before=systemd-soft-reboot.service
+After=systemd-soft-reboot.service
 AllowIsolate=yes
 JobTimeoutSec=30min
 JobTimeoutAction=soft-reboot-force
diff --git a/units/systemd-soft-reboot.service b/units/systemd-soft-reboot.service
index da9f463821..35ba3a9fc4 100644
--- a/units/systemd-soft-reboot.service
+++ b/units/systemd-soft-reboot.service
@@ -11,5 +11,6 @@
 Description=Reboot System Userspace
 Documentation=man:systemd-soft-reboot.service(8)
 DefaultDependencies=no
-Requires=soft-reboot.target
+Requires=shutdown.target umount.target final.target
+After=shutdown.target umount.target final.target
 SuccessAction=soft-reboot-force