diff --git a/tasks/apache.yml b/tasks/apache.yml
index 57706bd..427107e 100644
--- a/tasks/apache.yml
+++ b/tasks/apache.yml
@@ -13,5 +13,5 @@
   lineinfile:
     path: /etc/apache2/conf-available/nextcloud_sites.conf
     insertafter: "^Ansbile"
-    line: "Use NCSite {{ nextcloud_domain }} {{ common_name }}"
+    line: "Use NCSite {{ domain }} {{ user }}"
   notify: reload apache
diff --git a/tasks/database.yml b/tasks/database.yml
index fd83432..c59c7c3 100644
--- a/tasks/database.yml
+++ b/tasks/database.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Datenbank einrichten"
   mysql_db:
-    name: '{{ nextcloud_mysql_db }}'
+    name: "{{ database }}"
     state: present
     login_unix_socket: "{{ mysql_socket }}"
     login_user: root
@@ -10,10 +10,10 @@
 
 - name: "Datenbank Benutzer einrichten"
   mysql_user:
-    name: "{{ nextcloud_mysql_user }}"
-    host: "{{ nextcloud_host }}"
-    password: "{{ lookup('password', '/tmp/passwordfile chars=ascii_letters') }}"
-    priv: "{{ nextcloud_mysql_db }}.*:ALL"
+    name: "{{ database }}"
+    host: "{{ inventory_hostname }}"
+    password: "{{ lookup('password', '/tmp/nc_db_password chars=ascii_letters') }}"
+    priv: "{{ database }}.*:ALL"
     state: present
     login_unix_socket: "{{ mysql_socket }}"
     login_user: root
diff --git a/tasks/gateway.yml b/tasks/gateway.yml
index 6e08c5d..812a19e 100644
--- a/tasks/gateway.yml
+++ b/tasks/gateway.yml
@@ -3,27 +3,27 @@
   lineinfile:
     path: /etc/dehydrated/domains.txt
     insertafter: "^# nextcloud"
-    line: "{{ nextcloud_domain }}"
+    line: "{{ domain }}"
    # when: dehydrated_installiert
-  delegate_to: "{{ nextcloud_gateway }}"
+  delegate_to: "{{ gateway_host }}"
 
 - name: "Gateway Zertifikat erstellen"
   command: dehydrated --cron -g
-  delegate_to: "{{ nextcloud_gateway }}"
+  delegate_to: "{{ gateway_host }}"
 
 - name: "Gateway Proxy einrichten"
   template:
     src: nginx_site.j2
-    dest: "/etc/nginx/sites-available/{{ nextcloud_domain }}"
+    dest: "/etc/nginx/sites-available/{{ domain }}"
     owner: root
     group: root
     mode: 0644
-  delegate_to: "{{ nextcloud_gateway }}"
+  delegate_to: "{{ gateway_host }}"
 
 - name: "Gateway Seite aktivieren"
   file:
-    src: "/etc/nginx/sites-available/{{ nextcloud_domain }}"
-    dest: "/etc/nginx/sites-enabled/{{ nextcloud_domain }}"
+    src: "/etc/nginx/sites-available/{{ domain }}"
+    dest: "/etc/nginx/sites-enabled/{{ domain }}"
     state: link
   notify: reload nginx
-  delegate_to: "{{ nextcloud_gateway }}"
+  delegate_to: "{{ gateway_host }}"
diff --git a/tasks/nextcloud.yml b/tasks/nextcloud.yml
index 920df74..a76d000 100644
--- a/tasks/nextcloud.yml
+++ b/tasks/nextcloud.yml
@@ -13,40 +13,41 @@
     extra_opts:
       - "--strip-components=1"
     dest: "{{ nextcloud_install_path }}"
-    owner: "{{ common_name }}"
-    group: "{{ common_name }}"
+    owner: "{{ user }}"
+    group: "{{ user }}"
     mode: 0755
 
 - name: "NC Installation"
   command: >
     php "{{ nextcloud_install_path }}"/occ maintenance:install --database "mysql"
-    --database-name "{{ nextcloud_mysql_db }}" --database-user "{{ nextcloud_mysql_user }}"
-    --database-pass "{{ lookup('password', '/tmp/passwordfile chars=ascii_letters') }}" --database-host "{{ nextcloud_database_host }}"
+    --database-name "{{ database }}" --database-user "{{ database }}"
+    --database-pass "{{ lookup('password', '/tmp/nc_db_password chars=ascii_letters') }}" --database-host "{{ database_host }}"
     --admin-user "{{ nextcloud_admin_user }}" --admin-pass "{{ nextcloud_admin_pw }}"
   become: true
-  become_user: "{{ common_name }}"
+  become_user: "{{ user }}"
   changed_when: true
 
+#todo: Auch auf instances.alias anwenden
 - 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 }}"
+  become_user: "{{ name }}"
   changed_when: true
   with_indexed_items:
     - '{{ nextcloud_trusted_domains  }}'
 
 - name: "NC cron einrichten"
   cron:
-    name: "nextcloud {{ nextcloud_domain }}"
+    name: "nextcloud {{ domain }}"
     minute: "*/5"
-    user: "{{ common_name }}"
+    user: "{{ user }}"
     job: "php -f {{ nextcloud_install_path}}/cron.php"
     cron_file: "nextcloud"
 
 - name: "NC allgemeie Konfiguration"
   command: "{{ item }}"
   become: true
-  become_user: "{{ common_name }}"
+  become_user: "{{ user }}"
   changed_when: true
   with_items:
     - "php {{ nextcloud_install_path }}/occ app:enable encryption"
@@ -54,7 +55,7 @@
     - 'php {{ nextcloud_install_path }}/occ config:system:set memcache.local --value "\\OC\\Memcache\\APCu"'
     - 'php {{ nextcloud_install_path }}/occ config:system:set memcache.distributed --value "\OC\Memcache\Redis"'
     - "php {{ nextcloud_install_path }}/occ background:cron"
-    - 'php {{ nextcloud_install_path }}/occ config:system:set overwrite.cli.url --value https://{{ nextcloud_domain }}'
+    - 'php {{ nextcloud_install_path }}/occ config:system:set overwrite.cli.url --value https://{{ domain }}'
     - 'php {{ nextcloud_install_path }}/occ config:system:set htaccess.RewriteBase --value /'
     - 'php {{ nextcloud_install_path }}/occ maintenance:update:htaccess'
     - 'php {{ nextcloud_install_path }}/occ config:system:set default_language --value "de"'
@@ -92,7 +93,7 @@
 - name: "NC trusted proxies einrichten"
   command: 'php {{ nextcloud_install_path }}/occ config:system:set trusted_proxies {{ item.0 }} --value "{{ item.1 }}"'
   become: true
-  become_user: "{{ common_name }}"
+  become_user: "{{ user }}"
   changed_when: true
   with_indexed_items:
     - '{{ nextcloud_trusted_proxies }}'
diff --git a/tasks/php.yml b/tasks/php.yml
index 3347d13..951c109 100644
--- a/tasks/php.yml
+++ b/tasks/php.yml
@@ -2,7 +2,7 @@
 
 - name: "PHP FPM-Nutzer anlegen"
   user:
-    name: "{{ common_name }}"
+    name: "{{ user }}"
     create_home: no
     password: "!"
     groups: redis
@@ -12,7 +12,7 @@
 - name: "PHP FPM-Pool einrichten"
   template:
     src: php_fpm_pool.j2
-    dest: "/etc/php/{{ php_version }}/fpm/pool.d/{{ common_name }}.conf"
+    dest: "/etc/php/{{ php_version }}/fpm/pool.d/{{ user }}.conf"
     owner: root
     group: root
     mode: 0644