diff --git a/Documents/bin/server-backup b/Documents/bin/server-backup
index 21e02f8a758c233f0a6ab4dad0c457fcc5426f46..6d3ceae203e7e3fa8bbcc79957f6a9a1f152ccd6 100755
--- a/Documents/bin/server-backup
+++ b/Documents/bin/server-backup
@@ -8,10 +8,16 @@ usage() {
 if [ "$#" -eq 0 ]
 then
     ssh -t host01.shore.co.il -o \
-        "RemoteCommand tmux new-session -As backup sudo sh -c 'mount /dev/sdb1 /mnt && offsite-backup /mnt && umount /mnt'"
+        "RemoteCommand sudo mount /dev/sdb1 /mnt"
+    ssh host01.shore.co.il -o \
+        "RemoteCommand sudo -H systemd-run --unit server-backup --collect  sh -c 'offsite-backup /mnt && umount /mnt'"
 elif [ "$1" = '-c' ]
 then
-    if ssh host01.shore.co.il tmux has-session -t backup 2>/dev/null
+    if ssh host01.shore.co.il systemctl --system is-failed server-backup.service >/dev/null
+    then
+        echo 'Backup failed.'
+        exit 1
+    elif ssh host01.shore.co.il systemctl --system is-active server-backup.service >/dev/null
     then
         echo 'Backup is still running.'
     else