diff --git a/tasks/database.yml b/tasks/database.yml
index 4b9b727..e700cdf 100644
--- a/tasks/database.yml
+++ b/tasks/database.yml
@@ -23,18 +23,18 @@
 - name: "Richte PostgreSQL-Datenbank ein"
   when: item.database_type == "PostgreSQL"
   block:
-    - name: "Database | Erstelle Datenbank | {{ item.name }}"
-      community.postgresql.postgresql_db:
-        name: "{{ item.database }}"
-        encoding: UTF8
-        template: template0
-      become: true
-      become_user: postgres
-
     - name: "Database | Richte Datenbank-Benutzer ein | {{ item.name }}"
       community.postgresql.postgresql_user:
         name: "{{ item.database }}"
         password: "{{ nextcloud_db_password }}"
-        db: "{{ item.database }}"
+      become: true
+      become_user: postgres
+
+    - name: "Database | Erstelle Datenbank | {{ item.name }}"
+      community.postgresql.postgresql_db:
+        name: "{{ item.database }}"
+        owner: "{{ item.database }}"
+        encoding: UTF8
+        template: template0
       become: true
       become_user: postgres