diff --git a/script/systemd/zammad.service b/script/systemd/zammad.service
index a3a7baac1..b928cd2a5 100644
--- a/script/systemd/zammad.service
+++ b/script/systemd/zammad.service
@@ -4,9 +4,10 @@ Description=Zammad Application
 [Service]
 Type=forking
 User=zammad
-WorkingDirectory=/homer/zammad/zammad
+WorkingDirectory=/home/zammad/zammad
 Environment=RAILS_ENV=production
-ExecStart=puma -p 3000 -d -e production
+PIDFile=/var/run/zammad.puma.pid
+ExecStart=puma -p 3000 -d -e production --pidfile /var/run/zammad.puma.pid
 
 [Install]
 WantedBy=multi-user.target