diff --git a/conf/systemd.service b/conf/systemd.service
index 70c3c85..0f6c708 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -1,16 +1,14 @@
 [Unit]
 Description=The Lounge IRC client
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple
 User=__APP__
 Group=__APP__
-WorkingDirectory=__FINALPATH__/
-Environment="PATH=__ENV_PATH__"
 Environment="THELOUNGE_HOME=/home/yunohost.app/__APP__/"
-Environment="NODE_ENV=production"
-ExecStart=/usr/bin/yarn start
+ExecStart=/usr/bin/thelounge start
 Restart=on-failure
 RestartSec=5
 StartLimitInterval=60s