diff --git a/units/hibernate.target b/units/hibernate.target
index 143eb59230c..0e1bc032583 100644
--- a/units/hibernate.target
+++ b/units/hibernate.target
@@ -9,5 +9,6 @@
 Description=Hibernate
 Documentation=man:systemd.special(7)
 DefaultDependencies=no
-BindsTo=systemd-hibernate.service
+Requires=systemd-hibernate.service
 After=systemd-hibernate.service
+StopWhenUnneeded=yes
diff --git a/units/hybrid-sleep.target b/units/hybrid-sleep.target
index d2d34092250..410e131b6ea 100644
--- a/units/hybrid-sleep.target
+++ b/units/hybrid-sleep.target
@@ -9,5 +9,6 @@
 Description=Hybrid Suspend+Hibernate
 Documentation=man:systemd.special(7)
 DefaultDependencies=no
-BindsTo=systemd-hybrid-sleep.service
+Requires=systemd-hybrid-sleep.service
 After=systemd-hybrid-sleep.service
+StopWhenUnneeded=yes
diff --git a/units/suspend.target b/units/suspend.target
index f50cb2264f5..80d652755c7 100644
--- a/units/suspend.target
+++ b/units/suspend.target
@@ -9,5 +9,6 @@
 Description=Suspend
 Documentation=man:systemd.special(7)
 DefaultDependencies=no
-BindsTo=systemd-suspend.service
+Requires=systemd-suspend.service
 After=systemd-suspend.service
+StopWhenUnneeded=yes