diff --git a/conf/xftp.systemd.service b/conf/xftp.systemd.service
index d7c20dc..0f29b5d 100644
--- a/conf/xftp.systemd.service
+++ b/conf/xftp.systemd.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=SimpleX: Messaging Protocol Server
+Description=XFTP server systemd service
 After=network.target
 
 [Service]
@@ -7,10 +7,11 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
-ExecStart=__INSTALL_DIR__/xftp-server start
-Restart=always
-RestartSec=3
+ExecStart=__INSTALL_DIR__/xftp-server start +RTS -N -RTS
+#ExecStopPost=/usr/bin/env sh -c '[ -e "/var/opt/simplex-xftp/file-server-store.log" ] && cp "/var/opt/simplex-xftp/file-server-store.log" "/var/opt/simplex-xftp/file-server-store.log.$(date +'%FT%T')"'
+LimitNOFILE=65535
 KillSignal=SIGINT
+TimeoutStopSec=infinity
 
 # Sandboxing options to harden security
 # Depending on specificities of your service/app, you may need to tweak these