diff --git a/defaults/main.yml b/defaults/main.yml
index c76bdf7..682f31d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -16,6 +16,7 @@ zammad_database_name: zammad
 zammad_database_password: "{{ lookup('password', '/tmp/zammad_database_pwd length=42 chars=ascii_letters,digits') }}"
 zammad_database_user: zammad
 zammad_database_configuration: "{{ zammad_home }}/config/database.yml"
+zammad_env_file: /etc/zammad/zammad.env
 zammad_home: /opt/zammad
 zammad_host: support.sao
 zammad_log_file: zammad.log
diff --git a/tasks/systemd.yml b/tasks/systemd.yml
index 5ff31b4..dfcd24b 100644
--- a/tasks/systemd.yml
+++ b/tasks/systemd.yml
@@ -3,15 +3,11 @@
     src: "systemd/{{ item }}.j2"
     dest: "/etc/systemd/system/{{ item }}"
   loop:
+    - zammad.service
     - zammad-rails.service
     - zammad-scheduler.service
     - zammad-websocket.service
 
-- name: "systemd: Kopiere Zammad-Service"
-  copy:
-    src: zammad.service
-    dest: /etc/systemd/system/zammad.service
-
 - name: "systemd: Erstelle Konfigurationsverzeichnis"
   file:
     path: /etc/zammad
@@ -20,13 +16,12 @@
 - name: "systemd: Kopiere Konfiguration"
   copy:
     src: zammad.env
-    dest: /etc/zammad/zammad.env
+    dest: "{{ zammad_env_file }}"
     force: no
 
 - name: "systemd: Aktiviere Service"
   systemd:
+    name: zammad
     enabled: yes
     daemon_reload: yes
     state: started
-    name: zammad
-
diff --git a/tasks/zammad.yml b/tasks/zammad.yml
index 6ecc84c..2f6a46c 100644
--- a/tasks/zammad.yml
+++ b/tasks/zammad.yml
@@ -1,11 +1,11 @@
-- name: "zammad: Hole Zammad Repo"
+- name: "zammad | Hole Zammad Repo"
   git:
     repo: "{{ zammad_repo }}"
     dest: "{{ zammad_home }}"
     version: stable
     force: yes
 
-- name: "zammad: Ändere Besitzrechte"
+- name: "zammad | Ändere Besitzrechte"
   file:
     path: "{{ zammad_home }}"
     state: directory
@@ -14,34 +14,34 @@
     group: "{{ zammad_user }}"
 
 # https://github.com/zammad/zammad/issues/325
-- name: "zammad: Wende plain-Text-Patch an"
+- name: "zammad | Wende plain-Text-Patch an"
   patch:
     src: plain-text.patch
     dest: "{{ zammad_home }}/app/models/channel/email_build.rb"
 
 # https://github.com/zammad/zammad/pull/3682
-- name: "zammad: Wende ldap-user-filter-Patch an"
+- name: "zammad | Wende ldap-user-filter-Patch an"
   patch:
     src: ldap-user-filter.patch
     dest: "{{ zammad_home }}/lib/ldap/user.rb"
 
-- name: "zammad: Ermittle Ruby-Version"
+- name: "zammad | Ermittle Ruby-Version"
   shell: cat "{{ zammad_home }}/.ruby-version"
   register: ruby_version
   changed_when: false
 
-- name: "zammad: Kopiere Skripte"
+- name: "zammad | Kopiere Skripte"
   template:
     src: zammad-delete-customers.rb.j2
     dest: "{{ local_scripts_dir }}/zammad-delete-customers.rb"
 
-- name: "zammad: Kopiere Updater"
+- name: "zammad | Kopiere Updater"
   template:
     src: zammad-updater.j2
     dest: "{{ local_scripts_dir }}/zammad-updater"
     mode: 0755
 
-- name: "zammad: Richte cron ein"
+- name: "zammad | Richte cron ein"
   cron:
     cron_file: "{{ cron_file }}"
     user: "{{ zammad_user }}"
@@ -50,3 +50,8 @@
     hour: "1"
     day: "1"
     job: "cd {{ zammad_home }} && RAILS_ENV=production rbenv exec rails r {{ local_scripts_dir }}/zammad-delete-customers.rb"
+
+- name: "zammad | Erstelle Alias"
+  lineinfile:
+    path: /root/.bashrc
+    line: 'alias zammad="cd {{ zammad_home }} && sudo -u {{ zammad_user }} RAILS_ENV=production rbenv exec rails"'
diff --git a/files/zammad.service b/templates/systemd/zammad.service.j2
similarity index 76%
rename from files/zammad.service
rename to templates/systemd/zammad.service.j2
index d27f3e3..c506ad6 100644
--- a/files/zammad.service
+++ b/templates/systemd/zammad.service.j2
@@ -8,9 +8,9 @@ Wants=zammad-scheduler.service
 Wants=zammad-websocket.service
 
 [Service]
-EnvironmentFile=/etc/zammad/zammad.env
-User=zammad
-Group=zammad
+EnvironmentFile={{ zammad_env_file }}
+User={{ zammad_user }}
+Group={{ zammad_user }}
 Restart=always
 ExecStart=/bin/sleep infinity