diff --git a/tasks/cron.yml b/tasks/cron.yml
index 85dba7a..8b662e8 100644
--- a/tasks/cron.yml
+++ b/tasks/cron.yml
@@ -1,13 +1,13 @@
 ---
 - name: "cron | Setze Umgebungsvariablen"
-  cron:
+  ansible.builtin.cron:
     user: "{{ zammad_user }}"
     name: RAILS_ENV
     job: production
     env: true
 
 - name: "cron | Richte cron ein"
-  cron:
+  ansible.builtin.cron:
     user: "{{ zammad_user }}"
     name: "Loesche unbenutzte Zammad-Kunden"
     minute: "1"
diff --git a/tasks/customizations.yml b/tasks/customizations.yml
index 144d162..a030d77 100644
--- a/tasks/customizations.yml
+++ b/tasks/customizations.yml
@@ -1,7 +1,8 @@
 ---
 - name: "customizations | Kopiere custom css"
-  copy:
+  ansible.builtin.copy:
     src: senselab.css
     dest: "{{ zammad_home }}/app/assets/stylesheets/custom/senselab.css"
     owner: "{{ zammad_user }}"
     group: "{{ zammad_user }}"
+    mode: "0644"
diff --git a/tasks/database.yml b/tasks/database.yml
index dc5b3b9..bcc216a 100644
--- a/tasks/database.yml
+++ b/tasks/database.yml
@@ -1,6 +1,6 @@
 ---
 - name: "database | Datenbank anlegen"
-  postgresql_db:
+  community.postgresql.postgresql_db:
     name: "{{ zammad_database_name }}"
     encoding: UTF8
     template: template0
@@ -10,7 +10,7 @@
   register: database_created
 
 - name: "database | Benutzer einrichten"
-  postgresql_user:
+  community.postgresql.postgresql_user:
     name: "{{ zammad_database_user }}"
     password: "{{ zammad_database_password }}"
     db: "{{ zammad_database_name }}"
@@ -19,15 +19,15 @@
   delegate_to: "{{ database_host }}"
 
 - name: "database | Konfiguration kopieren"
-  template:
+  ansible.builtin.template:
     src: database.yml.j2
     dest: "{{ zammad_database_configuration }}"
     owner: "{{ zammad_user }}"
     group: "{{ zammad_user }}"
-    mode: 0600
+    mode: "0600"
 
 - name: "database | Stoppe Service"
-  service:
+  ansible.builtin.service:
     name: zammad
     state: stopped
   register: unused_disable
@@ -35,7 +35,7 @@
   failed_when: "unused_disable is failed and ('find' not in unused_disable.msg and 'found' not in unused_disable.msg)"
 
 - name: "database | Führe Migrationen aus"
-  shell: "rbenv exec bundle exec rake db:migrate"
+  ansible.builtin.shell: "rbenv exec bundle exec rake db:migrate"
   args:
     chdir: "{{ zammad_home }}"
   become: true
@@ -44,7 +44,7 @@
     RAILS_ENV: production
 
 - name: "database | Führe Seeds aus"
-  shell: "rbenv exec bundle exec rake db:seed"
+  ansible.builtin.shell: "rbenv exec bundle exec rake db:seed"
   args:
     chdir: "{{ zammad_home }}"
   become: true
@@ -54,7 +54,7 @@
   when: database_created.changed
 
 - name: "database | Precompile Assets"
-  shell: "rbenv exec bundle exec rake assets:precompile"
+  ansible.builtin.shell: "rbenv exec bundle exec rake assets:precompile"
   args:
     chdir: "{{ zammad_home }}"
   become: true
@@ -63,7 +63,7 @@
     RAILS_ENV: production
 
 - name: "database | Synchronisiere Locales"
-  shell: rbenv exec bundle exec rails r "Locale.sync"
+  ansible.builtin.shell: rbenv exec bundle exec rails r "Locale.sync"
   args:
     chdir: "{{ zammad_home }}"
   become: true
@@ -72,7 +72,7 @@
     RAILS_ENV: production
 
 - name: "database | Synchronisiere Translations"
-  shell: rbenv exec bundle exec rails r "Translation.sync"
+  ansible.builtin.shell: rbenv exec bundle exec rails r "Translation.sync"
   args:
     chdir: "{{ zammad_home }}"
   become: true
diff --git a/tasks/locales.yml b/tasks/locales.yml
index f65d06c..e628246 100644
--- a/tasks/locales.yml
+++ b/tasks/locales.yml
@@ -1,4 +1,5 @@
-- name: "locales: Richte locales ein"
-  locale_gen:
+---
+- name: "Locales | Richte locales ein"
+  community.general.locale_gen:
     name: en_US.UTF-8
     state: present
diff --git a/tasks/opensearch.yml b/tasks/opensearch.yml
index a359f1a..9f9b2a1 100644
--- a/tasks/opensearch.yml
+++ b/tasks/opensearch.yml
@@ -24,7 +24,7 @@
   ansible.builtin.template:
     src: opensearch.yml
     dest: /etc/opensearch/opensearch.yml
-    mode: 0644
+    mode: "0644"
 
 - name: "Opensearch | Setze empfohlene Optionen"
   ansible.builtin.replace:
@@ -94,5 +94,5 @@
   ansible.builtin.template:
     src: opensearch.monit
     dest: /etc/monit/conf-enabled/opensearch
-    mode: 0644
+    mode: "0644"
   notify: reload monit
diff --git a/tasks/systemd.yml b/tasks/systemd.yml
index a695d54..956da96 100644
--- a/tasks/systemd.yml
+++ b/tasks/systemd.yml
@@ -1,7 +1,9 @@
+---
 - name: "systemd | Kopiere Services"
-  template:
+  ansible.builtin.template:
     src: "systemd/{{ item }}.j2"
     dest: "/etc/systemd/system/{{ item }}"
+    mode: "0644"
   loop:
     - zammad.service
     - zammad-rails.service
@@ -9,18 +11,19 @@
     - zammad-websocket.service
 
 - name: "systemd | Erstelle Konfigurationsverzeichnis"
-  file:
+  ansible.builtin.file:
     path: /etc/zammad
     state: directory
+    mode: "0755"
 
 - name: "systemd | Kopiere Konfiguration"
-  copy:
+  ansible.builtin.copy:
     src: zammad.env
     dest: "{{ zammad_env_file }}"
-    force: no
+    mode: "0644"
 
 - name: "systemd | Aktiviere Service"
-  systemd:
+  ansible.builtin.systemd:
     name: zammad
     enabled: true
     daemon_reload: true