diff --git a/roles/docker/files/configs/element/riot.im.conf b/roles/docker/files/element/riot.im.conf
similarity index 100%
rename from roles/docker/files/configs/element/riot.im.conf
rename to roles/docker/files/element/riot.im.conf
diff --git a/roles/docker/files/configs/mastodon/postgresql.conf b/roles/docker/files/mastodon/postgresql.conf
similarity index 100%
rename from roles/docker/files/configs/mastodon/postgresql.conf
rename to roles/docker/files/mastodon/postgresql.conf
diff --git a/roles/docker/files/configs/matrix/matrix.data.coop.log.config b/roles/docker/files/matrix/log.config
similarity index 100%
rename from roles/docker/files/configs/matrix/matrix.data.coop.log.config
rename to roles/docker/files/matrix/log.config
diff --git a/roles/docker/files/configs/privatebin-conf.php b/roles/docker/files/privatebin/conf.php
similarity index 100%
rename from roles/docker/files/configs/privatebin-conf.php
rename to roles/docker/files/privatebin/conf.php
diff --git a/roles/docker/files/configs/matrix/vhost-root b/roles/docker/files/vhost/base_domain
similarity index 100%
rename from roles/docker/files/configs/matrix/vhost-root
rename to roles/docker/files/vhost/base_domain
diff --git a/roles/docker/files/configs/docker_registry/nginx.conf b/roles/docker/files/vhost/docker_registry
similarity index 100%
rename from roles/docker/files/configs/docker_registry/nginx.conf
rename to roles/docker/files/vhost/docker_registry
diff --git a/roles/docker/files/configs/matrix/vhost-element b/roles/docker/files/vhost/element
similarity index 100%
rename from roles/docker/files/configs/matrix/vhost-element
rename to roles/docker/files/vhost/element
diff --git a/roles/docker/files/configs/mastodon/vhost-mastodon b/roles/docker/files/vhost/mastodon
similarity index 100%
rename from roles/docker/files/configs/mastodon/vhost-mastodon
rename to roles/docker/files/vhost/mastodon
diff --git a/roles/docker/files/configs/matrix/vhost-matrix b/roles/docker/files/vhost/matrix
similarity index 100%
rename from roles/docker/files/configs/matrix/vhost-matrix
rename to roles/docker/files/vhost/matrix
diff --git a/roles/docker/files/configs/nextcloud/vhost b/roles/docker/files/vhost/nextcloud
similarity index 100%
rename from roles/docker/files/configs/nextcloud/vhost
rename to roles/docker/files/vhost/nextcloud
diff --git a/roles/docker/files/configs/vhost-www b/roles/docker/files/vhost/www.base_domain
similarity index 100%
rename from roles/docker/files/configs/vhost-www
rename to roles/docker/files/vhost/www.base_domain
diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml
index e37a19f..ad671dd 100644
--- a/roles/docker/handlers/main.yml
+++ b/roles/docker/handlers/main.yml
@@ -5,4 +5,3 @@
     name: "nginx-proxy"
     restart: "yes"
     state: "started"
-  
diff --git a/roles/docker/tasks/services/docker_registry.yml b/roles/docker/tasks/services/docker_registry.yml
index 79c03b7..3adee6d 100644
--- a/roles/docker/tasks/services/docker_registry.yml
+++ b/roles/docker/tasks/services/docker_registry.yml
@@ -1,9 +1,9 @@
 # vim: ft=yaml.ansible
 ---
-- name: copy docker registry nginx configuration
+- name: copy docker registry vhost configuration
   copy:
-    src: "files/configs/docker_registry/nginx.conf"
-    dest: "/docker-volumes/nginx/vhost/{{ services.docker_registry.domain }}"
+    src: vhost/docker_registry
+    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.docker_registry.domain }}"
     mode: "0644"
 
 - name: docker registry container
diff --git a/roles/docker/tasks/services/hedgedoc.yml b/roles/docker/tasks/services/hedgedoc.yml
index 9450d6e..8160a66 100644
--- a/roles/docker/tasks/services/hedgedoc.yml
+++ b/roles/docker/tasks/services/hedgedoc.yml
@@ -12,7 +12,7 @@
 
 - name: copy sso public certificate
   copy:
-    src: "files/sso/sso.data.coop.pem"
+    src: sso/sso.data.coop.pem
     dest: "{{ services.hedgedoc.volume_folder }}/sso.data.coop.pem"
     mode: "0644"
 
@@ -33,7 +33,7 @@
             - "hedgedoc"
           volumes:
             - "{{ services.hedgedoc.volume_folder }}/db:/var/lib/postgresql/data"
-        
+
         app:
           image: "quay.io/hedgedoc/hedgedoc:{{ services.hedgedoc.version }}"
           environment:
@@ -55,7 +55,7 @@
             - "{{ services.hedgedoc.volume_folder }}/hedgedoc/uploads:/hedgedoc/public/uploads"
             - "{{ services.hedgedoc.volume_folder }}/sso.data.coop.pem:/sso.data.coop.pem"
           restart: "unless-stopped"
-          networks: 
+          networks:
             - "hedgedoc"
             - "external_services"
           depends_on:
diff --git a/roles/docker/tasks/services/mailu.yml b/roles/docker/tasks/services/mailu.yml
index e1181ef..168609a 100644
--- a/roles/docker/tasks/services/mailu.yml
+++ b/roles/docker/tasks/services/mailu.yml
@@ -25,7 +25,7 @@
 
 - name: upload mailu.env file
   template:
-    src: mailu.env.j2
+    src: mailu/env.j2
     dest: "{{ services.mailu.volume_folder }}/mailu.env"
 
 - name: hard link to Let's Encrypt TLS certificate
@@ -106,7 +106,7 @@
         admin:
           image: ghcr.io/mailu/admin:{{ services.mailu.version }}
           restart: always
-          env_file: "{{ services.mailu.volume_folder}}/mailu.env"
+          env_file: "{{ services.mailu.volume_folder }}/mailu.env"
           volumes:
             - "{{ services.mailu.volume_folder }}/data:/data"
             - "{{ services.mailu.volume_folder }}/dkim:/dkim"
diff --git a/roles/docker/tasks/services/mastodon.yml b/roles/docker/tasks/services/mastodon.yml
index d96e0bf..1c100ce 100644
--- a/roles/docker/tasks/services/mastodon.yml
+++ b/roles/docker/tasks/services/mastodon.yml
@@ -31,17 +31,17 @@
 
 - name: Copy mastodon environment file
   template:
-    src: files/configs/mastodon/env_file.j2
+    src: mastodon/env.j2
     dest: "{{ services.mastodon.volume_folder }}/env_file"
 
 - name: Upload vhost config for root domain
-  template:
-    src: files/configs/mastodon/vhost-mastodon
+  copy:
+    src: vhost/mastodon
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.mastodon.domain }}"
 
 - name: Copy PostgreSQL config
   copy:
-    src: files/configs/mastodon/postgresql.conf
+    src: mastodon/postgresql.conf
     dest: "{{ services.mastodon.volume_folder }}/postgres_config/postgresql.conf"
 
 - name: Set up Mastodon
diff --git a/roles/docker/tasks/services/matrix_element.yml b/roles/docker/tasks/services/matrix_element.yml
index 527fb89..b5a04b0 100644
--- a/roles/docker/tasks/services/matrix_element.yml
+++ b/roles/docker/tasks/services/matrix_element.yml
@@ -29,33 +29,33 @@
 
 - name: Upload Element config.json
   template:
-    src: files/configs/element/config.json
+    src: element/config.json.j2
     dest: "{{ services.element.volume_folder }}/data/config.json"
 
 - name: Upload Element riot.im.conf
-  template:
-    src: files/configs/element/riot.im.conf
+  copy:
+    src: element/riot.im.conf
     dest: "{{ services.element.volume_folder }}/data/riot.im.conf"
 
 - name: upload vhost config for matrix domain
-  template:
-    src: files/configs/matrix/vhost-matrix
+  copy:
+    src: vhost/matrix
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.matrix.domain }}"
 
 - name: Upload vhost config for Element domain
-  template:
-    src: files/configs/matrix/vhost-element
+  copy:
+    src: vhost/element
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ item }}"
   loop: "{{ services.element.domains }}"
 
 - name: Upload homeserver.yaml
   template:
-    src: "files/configs/matrix/homeserver.yaml.j2"
+    src: matrix/homeserver.yaml.j2
     dest: "{{ services.matrix.volume_folder }}/data/homeserver.yaml"
 
 - name: upload matrix logging config
-  template:
-    src: "files/configs/matrix/matrix.data.coop.log.config"
+  copy:
+    src: matrix/log.config
     dest: "{{ services.matrix.volume_folder }}/data/matrix.data.coop.log.config"
 
 - name: Set up Matrix and Element
diff --git a/roles/docker/tasks/services/nextcloud.yml b/roles/docker/tasks/services/nextcloud.yml
index 20e6c55..f1d19b0 100644
--- a/roles/docker/tasks/services/nextcloud.yml
+++ b/roles/docker/tasks/services/nextcloud.yml
@@ -1,8 +1,8 @@
 # vim: ft=yaml.ansible
 ---
 - name: upload vhost config for cloud.data.coop
-  template:
-    src: files/configs/nextcloud/vhost
+  copy:
+    src: vhost/nextcloud
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.nextcloud.domain }}"
   notify: "restart nginx"
 
diff --git a/roles/docker/tasks/services/privatebin.yml b/roles/docker/tasks/services/privatebin.yml
index fbbad29..354d81c 100644
--- a/roles/docker/tasks/services/privatebin.yml
+++ b/roles/docker/tasks/services/privatebin.yml
@@ -11,8 +11,8 @@
     loop_var: volume
 
 - name: upload privatebin config
-  template:
-    src: files/configs/privatebin-conf.php
+  copy:
+    src: privatebin/conf.php
     dest: "{{ services.privatebin.volume_folder }}/cfg/conf.php"
 
 - name: privatebin app container
diff --git a/roles/docker/tasks/services/rallly.yml b/roles/docker/tasks/services/rallly.yml
index 1d092c5..400073f 100644
--- a/roles/docker/tasks/services/rallly.yml
+++ b/roles/docker/tasks/services/rallly.yml
@@ -1,13 +1,13 @@
 # vim: ft=yaml.ansible
 ---
-- name: Create rallly volume folders
+- name: Create Rallly volume folders
   file:
     name: "{{ services.rallly.volume_folder }}/postgres"
     state: directory
 
 - name: Copy Rallly environment file
   template:
-    src: files/configs/rallly/env_file.j2
+    src: rallly/env.j2
     dest: "{{ services.rallly.volume_folder }}/env_file"
 
 - name: Set up Rallly
diff --git a/roles/docker/tasks/services/restic_backup.yml b/roles/docker/tasks/services/restic_backup.yml
index 8fce1b5..df0c278 100644
--- a/roles/docker/tasks/services/restic_backup.yml
+++ b/roles/docker/tasks/services/restic_backup.yml
@@ -33,7 +33,7 @@
 
 - name: Create SSH config
   template:
-    src: restic.ssh.config.j2
+    src: restic/ssh.config.j2
     dest: "{{ services.restic.volume_folder }}/ssh/config"
     owner: root
     group: root
@@ -41,7 +41,7 @@
 
 - name: Create SSH known_hosts file
   template:
-    src: restic.ssh.known_hosts.j2
+    src: restic/ssh.known_hosts.j2
     dest: "{{ services.restic.volume_folder }}/ssh/known_hosts"
     owner: root
     group: root
diff --git a/roles/docker/tasks/services/websites/data.coop.yml b/roles/docker/tasks/services/websites/data.coop.yml
index 9fe7075..89eda56 100644
--- a/roles/docker/tasks/services/websites/data.coop.yml
+++ b/roles/docker/tasks/services/websites/data.coop.yml
@@ -2,6 +2,15 @@
 ---
 - name: Upload vhost config for root domain
   copy:
+<<<<<<< HEAD
+    src: vhost/base_domain
+    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ base_domain }}"
+
+- name: Upload vhost config for WWW domain
+  copy:
+    src: vhost/www.base_domain
+    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/www.{{ base_domain }}"
+=======
     src: files/configs/matrix/vhost-root
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.data_coop_website.domain }}"
 
@@ -9,6 +18,7 @@
   copy:
     src: files/configs/vhost-www
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.data_coop_website.www_domain }}"
+>>>>>>> main
 
 - name: setup data.coop website docker container
   docker_container:
diff --git a/roles/docker/files/configs/element/config.json b/roles/docker/templates/element/config.json.j2
similarity index 100%
rename from roles/docker/files/configs/element/config.json
rename to roles/docker/templates/element/config.json.j2
diff --git a/roles/docker/templates/mailu.env.j2 b/roles/docker/templates/mailu/env.j2
similarity index 100%
rename from roles/docker/templates/mailu.env.j2
rename to roles/docker/templates/mailu/env.j2
diff --git a/roles/docker/files/configs/mastodon/env_file.j2 b/roles/docker/templates/mastodon/env.j2
similarity index 100%
rename from roles/docker/files/configs/mastodon/env_file.j2
rename to roles/docker/templates/mastodon/env.j2
diff --git a/roles/docker/files/configs/matrix/homeserver.yaml.j2 b/roles/docker/templates/matrix/homeserver.yaml.j2
similarity index 100%
rename from roles/docker/files/configs/matrix/homeserver.yaml.j2
rename to roles/docker/templates/matrix/homeserver.yaml.j2
diff --git a/roles/docker/files/configs/rallly/env_file.j2 b/roles/docker/templates/rallly/env.j2
similarity index 100%
rename from roles/docker/files/configs/rallly/env_file.j2
rename to roles/docker/templates/rallly/env.j2
diff --git a/roles/docker/templates/restic.ssh.config.j2 b/roles/docker/templates/restic/ssh.config.j2
similarity index 100%
rename from roles/docker/templates/restic.ssh.config.j2
rename to roles/docker/templates/restic/ssh.config.j2
diff --git a/roles/docker/templates/restic.ssh.known_hosts.j2 b/roles/docker/templates/restic/ssh.known_hosts.j2
similarity index 100%
rename from roles/docker/templates/restic.ssh.known_hosts.j2
rename to roles/docker/templates/restic/ssh.known_hosts.j2