diff --git a/server/src/assembly/ctbrec-systemd.service b/server/src/assembly/ctbrec-systemd.service
index ea3ec9ff..6f786aca 100644
--- a/server/src/assembly/ctbrec-systemd.service
+++ b/server/src/assembly/ctbrec-systemd.service
@@ -4,10 +4,11 @@ After=network.target
 
 [Service]
 WorkingDirectory=/opt/ctbrec
-SyslogIdentifier=SocketTest
+SyslogIdentifier=ctbrec
 ExecStart=-/usr/bin/java -Xmx256m -cp ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
 User=ctbrec
 Type=simple
+TimeoutSec=900
 
 [Install]
 WantedBy=multi-user.target