diff --git a/unit-files/b-u@.service b/unit-files/b-u@.service
index 463a3853be83ade1d47cd82e63648c14425f447a..8dbe35abf2d2ee71045ec2dad032cfdc9fbe4ec0 100644
--- a/unit-files/b-u@.service
+++ b/unit-files/b-u@.service
@@ -3,10 +3,12 @@ Description=Back up data from %i
 
 [Service]
 Type=oneshot
-TimeoutStartSec=0
+TimeoutStartSec=120
 WorkingDirectory=/data/domains/%i/
 EnvironmentFile=/etc/environment
+ExecStartPre=-/bin/docker kill clean-%i
 ExecStartPre=-/bin/docker rm clean-%i
+ExecStartPre=-/bin/docker kill backup-%i
 ExecStartPre=-/bin/docker rm backup-%i
 ExecStartPre=/bin/bash -euxc ' \
   /bin/docker run \
diff --git a/unit-files/backup-u@.service b/unit-files/backup-u@.service
index e66213347d9986316cb0cb58db3e6cc8d6bee188..c94ea149dc0a39b9b0fb38adb42c5e26c7916031 100644
--- a/unit-files/backup-u@.service
+++ b/unit-files/backup-u@.service
@@ -3,10 +3,12 @@ Description=Back up data from %i
 
 [Service]
 Type=oneshot
-TimeoutStartSec=0
+TimeoutStartSec=120
 WorkingDirectory=/data/domains/%i/
 EnvironmentFile=/etc/environment
+ExecStartPre=-/bin/docker kill clean-%i
 ExecStartPre=-/bin/docker rm clean-%i
+ExecStartPre=-/bin/docker kill backup-%i
 ExecStartPre=-/bin/docker rm backup-%i
 ExecStartPre=/bin/bash -euxc ' \
   /bin/docker run \