diff --git a/defaults/main.yml b/defaults/main.yml
index a9a02ee..ea4c34c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -17,7 +17,7 @@ nextcloud_php_memory_limit: 512M
 nextcloud_php_upload_limit: 512M
 nextcloud_trusted_domains: ['localhost', '{{ nextcloud_domain }}']
 nextcloud_trusted_proxies: ['10.42.7.1']
-nextcloud_version: nextcloud-20.0.2
+nextcloud_version: nextcloud-21.0.0
 
 nextcloud_mail_from: noreply
 nextcloud_mail_domain: postfach.senselab.org
diff --git a/tasks/gateway.yml b/tasks/gateway.yml
index 8406865..6e08c5d 100644
--- a/tasks/gateway.yml
+++ b/tasks/gateway.yml
@@ -7,7 +7,7 @@
    # when: dehydrated_installiert
   delegate_to: "{{ nextcloud_gateway }}"
 
-- name: "Gateway Zertifikat erstelle"
+- name: "Gateway Zertifikat erstellen"
   command: dehydrated --cron -g
   delegate_to: "{{ nextcloud_gateway }}"
 
diff --git a/tasks/nextcloud.yml b/tasks/nextcloud.yml
index a915e6d..4ebde48 100644
--- a/tasks/nextcloud.yml
+++ b/tasks/nextcloud.yml
@@ -21,13 +21,13 @@
   command: >
     php "{{ nextcloud_install_path }}"/occ maintenance:install --database "mysql"
     --database-name "{{ nextcloud_mysql_db }}" --database-user "{{ nextcloud_mysql_user }}"
-    --database-pass 2CHbJwLpXTgHQkiUnFCgoowfT7vQdt85BX7VfRBCtb --database-host "{{ nextcloud_database_host }}"
+    --database-pass "{{ lookup('password', '/tmp/passwordfile chars=ascii_letters') }}" --database-host "{{ nextcloud_database_host }}"
     --admin-user "{{ nextcloud_admin_user }}" --admin-pass "{{ nextcloud_admin_pw }}"
   become: true
   become_user: "{{ common_name }}"
   changed_when: true
 
-- name: "NC trusted domains einrichte"
+- name: "NC trusted domains einrichten"
   command: 'php {{ nextcloud_install_path }}/occ config:system:set trusted_domains {{ item.0 }} --value "{{ item.1 }}"'
   become: true
   become_user: "{{ common_name }}"
diff --git a/tasks/packages.yml b/tasks/packages.yml
index bdeee55..68d680a 100644
--- a/tasks/packages.yml
+++ b/tasks/packages.yml
@@ -9,7 +9,7 @@
       - python-pymysql
     update_cache: yes
     cache_valid_time: 3600
-    # nur für db_gast ausführen
+  delegate_to: "{{ nextcloud_gateway }}"
 
 - name: "Pakete installieren"
   apt:
diff --git a/tasks/php.yml b/tasks/php.yml
index 9feebab..3347d13 100644
--- a/tasks/php.yml
+++ b/tasks/php.yml
@@ -5,7 +5,7 @@
     name: "{{ common_name }}"
     create_home: no
     password: "!"
-    groups: "{{ common_name }},redis"
+    groups: redis
     shell: /bin/false
     state: present
 
diff --git a/tasks/redis.yml b/tasks/redis.yml
index d53e8f7..bb9a736 100644
--- a/tasks/redis.yml
+++ b/tasks/redis.yml
@@ -1,5 +1,4 @@
 ---
-
 - name: "Redis Aktiviere Socket"
   lineinfile:
     path: /etc/redis/redis.conf