diff --git a/units/systemd-exit.service b/units/systemd-exit.service
index 6029b13a052..773c400b476 100644
--- a/units/systemd-exit.service
+++ b/units/systemd-exit.service
@@ -8,9 +8,9 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Exit the Session
+Description=Exit the Container
 Documentation=man:systemd.special(7)
 DefaultDependencies=no
-Requires=shutdown.target
-After=shutdown.target
-SuccessAction=exit
+Requires=shutdown.target umount.target final.target
+After=shutdown.target umount.target final.target
+SuccessAction=exit-force