diff --git a/data/controldeck.service b/data/controldeck.service
index 5b4dfea..ede8608 100644
--- a/data/controldeck.service
+++ b/data/controldeck.service
@@ -1,16 +1,16 @@
 [Unit]
 Description=ControlDeck
-ConditionFileIsExecutable=%h/.local/bin/controldeck
+ConditionFileIsExecutable=/usr/bin/controldeck
+After=network.target
 
 [Service]
 Environment=PYTHONUNBUFFERED=1
 TimeoutStartSec=30
 ExecStartPre=/bin/sh -c 'source /etc/profile'
-ExecStart=%h/.local/bin/controldeck
-Restart=always
-RestartSec=10
+ExecStart=/usr/bin/controldeck
+Restart=on-failure
+RestartSec=4
 StandardOutput=journal
 
 [Install]
-#WantedBy=multi-user.target
 WantedBy=default.target
diff --git a/data/controldeck.service.local b/data/controldeck.service.local
new file mode 100644
index 0000000..011cefa
--- /dev/null
+++ b/data/controldeck.service.local
@@ -0,0 +1,16 @@
+[Unit]
+Description=ControlDeck
+ConditionFileIsExecutable=%h/.local/bin/controldeck
+After=network.target
+
+[Service]
+Environment=PYTHONUNBUFFERED=1
+TimeoutStartSec=30
+ExecStartPre=/bin/sh -c 'source /etc/profile'
+ExecStart=%h/.local/bin/controldeck
+Restart=on-failure
+RestartSec=4
+StandardOutput=journal
+
+[Install]
+WantedBy=default.target
diff --git a/setup.sh b/setup.sh
index 050a260..6113d64 100755
--- a/setup.sh
+++ b/setup.sh
@@ -6,5 +6,5 @@ mkdir -p $HOME/.local/share/applications
 cp data/controldeck.desktop $HOME/.local/share/applications/controldeck.desktop
 sed -i "s|\${HOME}|${HOME}|" ~/.local/share/applications/controldeck.desktop
 mkdir -p $HOME/.config/systemd/user
-ln -sf $PWD/data/controldeck.service $HOME/.config/systemd/user/controldeck.service
+ln -sf $PWD/data/controldeck.service.local $HOME/.config/systemd/user/controldeck.service
 #cp data/controldeck.service $HOME/.config/systemd/user/controldeck.service