diff --git a/ansible/roles/forrest/files/docker-compose-grafana.yml b/ansible/roles/forrest/files/grafana/docker-compose.yml
similarity index 100%
rename from ansible/roles/forrest/files/docker-compose-grafana.yml
rename to ansible/roles/forrest/files/grafana/docker-compose.yml
diff --git a/ansible/roles/forrest/files/docker-compose-influxdb.yml b/ansible/roles/forrest/files/influxdb/docker-compose.yml
similarity index 100%
rename from ansible/roles/forrest/files/docker-compose-influxdb.yml
rename to ansible/roles/forrest/files/influxdb/docker-compose.yml
diff --git a/ansible/roles/forrest/files/docker-compose-prometheus.yml b/ansible/roles/forrest/files/prometheus/docker-compose.yml
similarity index 100%
rename from ansible/roles/forrest/files/docker-compose-prometheus.yml
rename to ansible/roles/forrest/files/prometheus/docker-compose.yml
diff --git a/ansible/roles/forrest/files/prometheus.yml b/ansible/roles/forrest/files/prometheus/prometheus.yml
similarity index 100%
rename from ansible/roles/forrest/files/prometheus.yml
rename to ansible/roles/forrest/files/prometheus/prometheus.yml
diff --git a/ansible/roles/forrest/files/docker-compose-telegraf.yml b/ansible/roles/forrest/files/telegraf/docker-compose.yml
similarity index 100%
rename from ansible/roles/forrest/files/docker-compose-telegraf.yml
rename to ansible/roles/forrest/files/telegraf/docker-compose.yml
diff --git a/ansible/roles/forrest/files/telegraf.conf b/ansible/roles/forrest/files/telegraf/telegraf.conf
similarity index 100%
rename from ansible/roles/forrest/files/telegraf.conf
rename to ansible/roles/forrest/files/telegraf/telegraf.conf
diff --git a/ansible/roles/forrest/tasks/grafana.yml b/ansible/roles/forrest/tasks/grafana.yml
index d4469c1..834e24a 100644
--- a/ansible/roles/forrest/tasks/grafana.yml
+++ b/ansible/roles/forrest/tasks/grafana.yml
@@ -12,7 +12,7 @@
 
 - name: Install grafana compose file
   template:
-    src: files/docker-compose-grafana.yml
+    src: files/grafana/docker-compose.yml
     dest: /opt/grafana/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
diff --git a/ansible/roles/forrest/tasks/influxdb.yml b/ansible/roles/forrest/tasks/influxdb.yml
index a410f21..08363bc 100644
--- a/ansible/roles/forrest/tasks/influxdb.yml
+++ b/ansible/roles/forrest/tasks/influxdb.yml
@@ -8,7 +8,7 @@
 
 - name: Install influxdb compose file
   template:
-    src: files/docker-compose-influxdb.yml
+    src: files/influxdb/docker-compose.yml
     dest: /opt/influxdb/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
diff --git a/ansible/roles/forrest/tasks/prometheus.yml b/ansible/roles/forrest/tasks/prometheus.yml
index a8f7943..596515a 100644
--- a/ansible/roles/forrest/tasks/prometheus.yml
+++ b/ansible/roles/forrest/tasks/prometheus.yml
@@ -12,7 +12,7 @@
 
 - name: Install prometheus config
   template:
-    src: files/prometheus.yml
+    src: files/prometheus/prometheus.yml
     dest: /opt/prometheus/prometheus.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
@@ -21,7 +21,7 @@
 
 - name: Install prometheus compose file
   template:
-    src: files/docker-compose-prometheus.yml
+    src: files/prometheus/docker-compose.yml
     dest: /opt/prometheus/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
diff --git a/ansible/roles/forrest/tasks/telegraf.yml b/ansible/roles/forrest/tasks/telegraf.yml
index 91890b7..217fd0f 100644
--- a/ansible/roles/forrest/tasks/telegraf.yml
+++ b/ansible/roles/forrest/tasks/telegraf.yml
@@ -8,7 +8,7 @@
 
 - name: Install telegraf config
   template:
-    src: files/telegraf.conf
+    src: files/telegraf/telegraf.conf
     dest: /opt/telegraf/telegraf.conf
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
@@ -17,7 +17,7 @@
 
 - name: Install telegraf compose file
   template:
-    src: files/docker-compose-telegraf.yml
+    src: files/telegraf/docker-compose.yml
     dest: /opt/telegraf/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"