diff --git a/tasks/nextcloud_configuration.yml b/tasks/configuration.yml
similarity index 86%
rename from tasks/nextcloud_configuration.yml
rename to tasks/configuration.yml
index 38e00a1..c774166 100644
--- a/tasks/nextcloud_configuration.yml
+++ b/tasks/configuration.yml
@@ -5,7 +5,7 @@
   become_user: "{{ instance.user }}"
   changed_when: true
   with_indexed_items:
-    - '{{ nextcloud_trusted_domains  }}'
+    - '{{ nextcloud.trusted_domains|default(instance.name) }}'
 
 - name: "configuration: {{ instance.name }}: cron einrichten"
   cron:
@@ -37,13 +37,13 @@
     insertbefore: '^\);'
     marker_begin: mailserver
     block: |2
-        'mail_from_address' => '{{ nextcloud_mail_from }}',
+        'mail_from_address' => '{{ nextcloud.mail_from }}',
         'mail_smtpmode' => 'smtp',
         'mail_sendmailmode' => 'smtp',
-        'mail_domain' => '{{ nextcloud_mail_domain }}',
-        'mail_smtpauthtype' => '{{ nextcloud_smtp_auth_type }}',
-        'mail_smtphost' => '{{ nextcloud_smtp_host }}',
-        'mail_smtpport' => '{{ nextcloud_smtp_port}}',
+        'mail_domain' => '{{ nextcloud.mail_domain }}',
+        'mail_smtpauthtype' => '{{ nextcloud.smtp_auth_type }}',
+        'mail_smtphost' => '{{ nextcloud.smtp_host }}',
+        'mail_smtpport' => '{{ nextcloud.smtp_port}}',
 
 - name: "configuration: {{ instance.name }}: Filelocking"
   blockinfile:
@@ -66,4 +66,4 @@
   become_user: "{{ instance.user }}"
   changed_when: true
   with_indexed_items:
-    - "{{ nextcloud_trusted_proxies }}"
+    - "{{ nextcloud.trusted_proxies }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index 0ec8e4a..6d32627 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -22,7 +22,7 @@
   when: nc_is_installed.stat.exists == False
   tags: nextcloud
 
-- import_tasks: nextcloud_configuration.yml
+- import_tasks: configuration.yml
   tags: configuration
 
 - import_tasks: fixes.yml