diff --git a/roles/docker/files/configs/privatebin-conf.php b/roles/docker/files/configs/privatebin/conf.php
similarity index 100%
rename from roles/docker/files/configs/privatebin-conf.php
rename to roles/docker/files/configs/privatebin/conf.php
diff --git a/roles/docker/files/configs/mastodon/vhost-mastodon b/roles/docker/files/configs/vhost/mastodon
similarity index 100%
rename from roles/docker/files/configs/mastodon/vhost-mastodon
rename to roles/docker/files/configs/vhost/mastodon
diff --git a/roles/docker/files/configs/matrix/vhost-matrix b/roles/docker/files/configs/vhost/matrix
similarity index 100%
rename from roles/docker/files/configs/matrix/vhost-matrix
rename to roles/docker/files/configs/vhost/matrix
diff --git a/roles/docker/files/configs/nextcloud/vhost b/roles/docker/files/configs/vhost/nextcloud
similarity index 100%
rename from roles/docker/files/configs/nextcloud/vhost
rename to roles/docker/files/configs/vhost/nextcloud
diff --git a/roles/docker/files/configs/matrix/vhost-riot b/roles/docker/files/configs/vhost/riot
similarity index 100%
rename from roles/docker/files/configs/matrix/vhost-riot
rename to roles/docker/files/configs/vhost/riot
diff --git a/roles/docker/files/configs/matrix/vhost-root b/roles/docker/files/configs/vhost/root
similarity index 100%
rename from roles/docker/files/configs/matrix/vhost-root
rename to roles/docker/files/configs/vhost/root
diff --git a/roles/docker/tasks/services/mastodon.yml b/roles/docker/tasks/services/mastodon.yml
index 905ee0a..c448250 100644
--- a/roles/docker/tasks/services/mastodon.yml
+++ b/roles/docker/tasks/services/mastodon.yml
@@ -19,7 +19,7 @@
 
 - name: Upload vhost config for root domain
   copy:
-    src: configs/mastodon/vhost-mastodon
+    src: configs/vhost/mastodon
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.mastodon.domain }}"
 
 - name: Copy PostgreSQL config
diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml
index b7f952f..261fdea 100644
--- a/roles/docker/tasks/services/matrix_riot.yml
+++ b/roles/docker/tasks/services/matrix_riot.yml
@@ -38,17 +38,17 @@
 
 - name: upload vhost config for root domain
   copy:
-    src: configs/matrix/vhost-root
+    src: configs/vhost/root
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ base_domain }}"
 
 - name: upload vhost config for matrix domain
   copy:
-    src: configs/matrix/vhost-matrix
+    src: configs/vhost/matrix
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.matrix.domain }}"
 
 - name: upload vhost config for riot domains
   copy:
-    src: configs/matrix/vhost-riot
+    src: configs/vhost/riot
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ item }}"
   loop: "{{ services.riot.domains }}"
 
diff --git a/roles/docker/tasks/services/nextcloud.yml b/roles/docker/tasks/services/nextcloud.yml
index edfe3fe..8bfb246 100644
--- a/roles/docker/tasks/services/nextcloud.yml
+++ b/roles/docker/tasks/services/nextcloud.yml
@@ -1,7 +1,7 @@
 ---
 - name: upload vhost config for cloud.data.coop
   copy:
-    src: configs/nextcloud/vhost
+    src: configs/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 0e2a9ea..0213a40 100644
--- a/roles/docker/tasks/services/privatebin.yml
+++ b/roles/docker/tasks/services/privatebin.yml
@@ -12,7 +12,7 @@
 
 - name: upload privatebin config
   copy:
-    src: configs/privatebin-conf.php
+    src: configs/privatebin/conf.php
     dest: "{{ services.privatebin.volume_folder }}/cfg/conf.php"
 
 - name: privatebin app container