diff --git a/units/systemd-halt.service b/units/systemd-halt.service
index 3ce976f539..e3a35cc30d 100644
--- a/units/systemd-halt.service
+++ b/units/systemd-halt.service
@@ -13,7 +13,4 @@ Documentation=man:systemd-halt.service(8)
 DefaultDependencies=no
 Requires=shutdown.target umount.target final.target
 After=shutdown.target umount.target final.target
-
-[Service]
-Type=oneshot
-ExecStart=systemctl --force halt
+SuccessAction=halt-force
diff --git a/units/systemd-kexec.service b/units/systemd-kexec.service
index 916995c9d4..243fa3b3da 100644
--- a/units/systemd-kexec.service
+++ b/units/systemd-kexec.service
@@ -13,7 +13,4 @@ Documentation=man:systemd-kexec.service(8)
 DefaultDependencies=no
 Requires=shutdown.target umount.target final.target
 After=shutdown.target umount.target final.target
-
-[Service]
-Type=oneshot
-ExecStart=systemctl --force kexec
+SuccessAction=kexec-force