diff --git a/contrib/systemd/zammad.service b/contrib/systemd/zammad.service
deleted file mode 100644
index 15dfeef4b..000000000
--- a/contrib/systemd/zammad.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Zammad
-After=syslog.target
-After=network.target
-StopWhenUnneeded=true
-Wants=zammad-rails.service
-Wants=zammad-scheduler.service
-Wants=zammad-websocket.service
-
-[Service]
-Type=simple
-User=zammad
-Group=zammad
-Restart=always
-ExecStart=/bin/sleep infinity
-
-[Install]
-WantedBy=multi-user.target
diff --git a/contrib/systemd/install-zammad-systemd-services.sh b/script/systemd/install-zammad-systemd-services.sh
similarity index 100%
rename from contrib/systemd/install-zammad-systemd-services.sh
rename to script/systemd/install-zammad-systemd-services.sh
diff --git a/contrib/systemd/zammad-rails.service b/script/systemd/zammad-rails.service
similarity index 100%
rename from contrib/systemd/zammad-rails.service
rename to script/systemd/zammad-rails.service
diff --git a/contrib/systemd/zammad-scheduler.service b/script/systemd/zammad-scheduler.service
similarity index 100%
rename from contrib/systemd/zammad-scheduler.service
rename to script/systemd/zammad-scheduler.service
diff --git a/contrib/systemd/zammad-websocket.service b/script/systemd/zammad-websocket.service
similarity index 100%
rename from contrib/systemd/zammad-websocket.service
rename to script/systemd/zammad-websocket.service
diff --git a/script/systemd/zammad.service b/script/systemd/zammad.service
index b928cd2a5..15dfeef4b 100644
--- a/script/systemd/zammad.service
+++ b/script/systemd/zammad.service
@@ -1,13 +1,18 @@
 [Unit]
-Description=Zammad Application
+Description=Zammad
+After=syslog.target
+After=network.target
+StopWhenUnneeded=true
+Wants=zammad-rails.service
+Wants=zammad-scheduler.service
+Wants=zammad-websocket.service
 
 [Service]
-Type=forking
+Type=simple
 User=zammad
-WorkingDirectory=/home/zammad/zammad
-Environment=RAILS_ENV=production
-PIDFile=/var/run/zammad.puma.pid
-ExecStart=puma -p 3000 -d -e production --pidfile /var/run/zammad.puma.pid
+Group=zammad
+Restart=always
+ExecStart=/bin/sleep infinity
 
 [Install]
 WantedBy=multi-user.target