diff --git a/tasks/systemd.yml b/tasks/systemd.yml
index 956da96..02d74f6 100644
--- a/tasks/systemd.yml
+++ b/tasks/systemd.yml
@@ -7,7 +7,7 @@
   loop:
     - zammad.service
     - zammad-rails.service
-    - zammad-scheduler.service
+    - zammad-worker.service
     - zammad-websocket.service
 
 - name: "systemd | Erstelle Konfigurationsverzeichnis"
diff --git a/templates/systemd/zammad-scheduler.service.j2 b/templates/systemd/zammad-worker.service.j2
similarity index 69%
rename from templates/systemd/zammad-scheduler.service.j2
rename to templates/systemd/zammad-worker.service.j2
index 6bb6759..e25d8c4 100644
--- a/templates/systemd/zammad-scheduler.service.j2
+++ b/templates/systemd/zammad-worker.service.j2
@@ -1,12 +1,11 @@
 [Unit]
-Description=Zammad scheduler
+Description=Zammad Background Worker
 After=syslog.target
 After=network.target
 After=zammad.service
 Requires=zammad.service
 
 [Service]
-Type=forking
 EnvironmentFile=/etc/zammad/zammad.env
 User={{ zammad_user }}
 Group={{ zammad_user }}
@@ -14,7 +13,7 @@ Restart=always
 
 WorkingDirectory={{ zammad_home }}
 
-ExecStart=/bin/bash -l -c "${BUNDLE_BINARY} exec script/scheduler.rb start"
+ExecStart=/bin/bash -l -c "${BUNDLE_BINARY} exec script/background-worker.rb start"
 
 [Install]
 WantedBy=zammad.service