diff --git a/docker-compose.authentik.yaml b/compose.authentik.yaml
similarity index 100%
rename from docker-compose.authentik.yaml
rename to compose.authentik.yaml
diff --git a/docker-compose.autoheal.yaml b/compose.autoheal.yaml
similarity index 100%
rename from docker-compose.autoheal.yaml
rename to compose.autoheal.yaml
diff --git a/docker-compose.bazarr.yaml b/compose.bazarr.yaml
similarity index 100%
rename from docker-compose.bazarr.yaml
rename to compose.bazarr.yaml
diff --git a/docker-compose.borgmatic.yaml b/compose.borgmatic.yaml
similarity index 100%
rename from docker-compose.borgmatic.yaml
rename to compose.borgmatic.yaml
diff --git a/docker-compose.caddy.yaml b/compose.caddy.yaml
similarity index 100%
rename from docker-compose.caddy.yaml
rename to compose.caddy.yaml
diff --git a/docker-compose.collectd.yaml b/compose.collectd.yaml
similarity index 100%
rename from docker-compose.collectd.yaml
rename to compose.collectd.yaml
diff --git a/docker-compose.dns-ad-blocker.yaml b/compose.dns-ad-blocker.yaml
similarity index 100%
rename from docker-compose.dns-ad-blocker.yaml
rename to compose.dns-ad-blocker.yaml
diff --git a/docker-compose.droppy.yaml b/compose.droppy.yaml
similarity index 100%
rename from docker-compose.droppy.yaml
rename to compose.droppy.yaml
diff --git a/docker-compose.dsmr.yaml b/compose.dsmr.yaml
similarity index 100%
rename from docker-compose.dsmr.yaml
rename to compose.dsmr.yaml
diff --git a/docker-compose.esphome.yaml b/compose.esphome.yaml
similarity index 100%
rename from docker-compose.esphome.yaml
rename to compose.esphome.yaml
diff --git a/docker-compose.filebrowser.yaml b/compose.filebrowser.yaml
similarity index 100%
rename from docker-compose.filebrowser.yaml
rename to compose.filebrowser.yaml
diff --git a/docker-compose.grafana.yaml b/compose.grafana.yaml
similarity index 100%
rename from docker-compose.grafana.yaml
rename to compose.grafana.yaml
diff --git a/docker-compose.homarr.yaml b/compose.homarr.yaml
similarity index 100%
rename from docker-compose.homarr.yaml
rename to compose.homarr.yaml
diff --git a/docker-compose.homeassistant.yaml b/compose.homeassistant.yaml
similarity index 100%
rename from docker-compose.homeassistant.yaml
rename to compose.homeassistant.yaml
diff --git a/docker-compose.influxdb.yaml b/compose.influxdb.yaml
similarity index 100%
rename from docker-compose.influxdb.yaml
rename to compose.influxdb.yaml
diff --git a/docker-compose.jackett.yaml b/compose.jackett.yaml
similarity index 100%
rename from docker-compose.jackett.yaml
rename to compose.jackett.yaml
diff --git a/docker-compose.jellyfin.yaml b/compose.jellyfin.yaml
similarity index 100%
rename from docker-compose.jellyfin.yaml
rename to compose.jellyfin.yaml
diff --git a/docker-compose.jellyseerr.yaml b/compose.jellyseerr.yaml
similarity index 100%
rename from docker-compose.jellyseerr.yaml
rename to compose.jellyseerr.yaml
diff --git a/docker-compose.mosquitto.yaml b/compose.mosquitto.yaml
similarity index 100%
rename from docker-compose.mosquitto.yaml
rename to compose.mosquitto.yaml
diff --git a/docker-compose.openvpn-server.yaml b/compose.openvpn-server.yaml
similarity index 100%
rename from docker-compose.openvpn-server.yaml
rename to compose.openvpn-server.yaml
diff --git a/docker-compose.pgadmin.yaml b/compose.pgadmin.yaml
similarity index 100%
rename from docker-compose.pgadmin.yaml
rename to compose.pgadmin.yaml
diff --git a/docker-compose.photoprism.yaml b/compose.photoprism.yaml
similarity index 100%
rename from docker-compose.photoprism.yaml
rename to compose.photoprism.yaml
diff --git a/docker-compose.postgis.yaml b/compose.postgis.yaml
similarity index 100%
rename from docker-compose.postgis.yaml
rename to compose.postgis.yaml
diff --git a/docker-compose.qbittorrent.yaml b/compose.qbittorrent.yaml
similarity index 100%
rename from docker-compose.qbittorrent.yaml
rename to compose.qbittorrent.yaml
diff --git a/docker-compose.radarr.yaml b/compose.radarr.yaml
similarity index 100%
rename from docker-compose.radarr.yaml
rename to compose.radarr.yaml
diff --git a/docker-compose.rsnapshot.yaml b/compose.rsnapshot.yaml
similarity index 100%
rename from docker-compose.rsnapshot.yaml
rename to compose.rsnapshot.yaml
diff --git a/docker-compose.seafile.yaml b/compose.seafile.yaml
similarity index 100%
rename from docker-compose.seafile.yaml
rename to compose.seafile.yaml
diff --git a/docker-compose.socks.yaml b/compose.socks.yaml
similarity index 100%
rename from docker-compose.socks.yaml
rename to compose.socks.yaml
diff --git a/docker-compose.sonarr.yaml b/compose.sonarr.yaml
similarity index 100%
rename from docker-compose.sonarr.yaml
rename to compose.sonarr.yaml
diff --git a/docker-compose.surfshark.yaml b/compose.surfshark.yaml
similarity index 100%
rename from docker-compose.surfshark.yaml
rename to compose.surfshark.yaml
diff --git a/docker-compose.timescaledb.yaml b/compose.timescaledb.yaml
similarity index 100%
rename from docker-compose.timescaledb.yaml
rename to compose.timescaledb.yaml
diff --git a/docker-compose.transmission.yaml b/compose.transmission.yaml
similarity index 100%
rename from docker-compose.transmission.yaml
rename to compose.transmission.yaml
diff --git a/compose.yaml b/compose.yaml
new file mode 100644
index 0000000..91825ec
--- /dev/null
+++ b/compose.yaml
@@ -0,0 +1,52 @@
+include:
+# Web
+- compose.caddy.yaml
+
+# Authentication
+- compose.authentik.yaml
+
+# Other
+- compose.autoheal.yaml
+- compose.collectd.yaml
+- compose.homarr.yaml
+- compose.homeassistant.yaml
+- compose.grafana.yaml
+- compose.photoprism.yaml
+
+# Download
+- compose.jackett.yaml
+- compose.transmission.yaml
+- compose.qbittorrent.yaml
+
+# Media
+- compose.radarr.yaml
+- compose.sonarr.yaml
+- compose.bazarr.yaml
+- compose.jellyseerr.yaml
+- compose.jellyfin.yaml
+
+# Networking
+- compose.surfshark.yaml
+- compose.dns-ad-blocker.yaml
+#- compose.socks.yaml
+#- compose.openvpn-server.yaml
+
+# Backup
+- compose.rsnapshot.yaml
+- compose.borgmatic.yaml
+
+# Sensors
+- compose.dsmr.yaml
+- compose.esphome.yaml
+- compose.mosquitto.yaml
+
+# Storage
+- compose.seafile.yaml
+- compose.filebrowser.yaml
+- compose.droppy.yaml
+
+# Database
+- compose.pgadmin.yaml
+- compose.postgis.yaml
+- compose.timescaledb.yaml
+- compose.influxdb.yaml
diff --git a/docker-compose.yaml b/docker-compose.yaml
deleted file mode 100644
index fe88b9b..0000000
--- a/docker-compose.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-include:
-# Web
-- docker-compose.caddy.yaml
-
-# Authentication
-- docker-compose.authentik.yaml
-
-# Other
-- docker-compose.autoheal.yaml
-- docker-compose.collectd.yaml
-- docker-compose.homarr.yaml
-- docker-compose.homeassistant.yaml
-- docker-compose.grafana.yaml
-- docker-compose.photoprism.yaml
-
-# Download
-- docker-compose.jackett.yaml
-- docker-compose.transmission.yaml
-- docker-compose.qbittorrent.yaml
-
-# Media
-- docker-compose.radarr.yaml
-- docker-compose.sonarr.yaml
-- docker-compose.bazarr.yaml
-- docker-compose.jellyseerr.yaml
-- docker-compose.jellyfin.yaml
-
-# Networking
-- docker-compose.surfshark.yaml
-- docker-compose.dns-ad-blocker.yaml
-#- docker-compose.socks.yaml
-#- docker-compose.openvpn-server.yaml
-
-# Backup
-- docker-compose.rsnapshot.yaml
-- docker-compose.borgmatic.yaml
-
-# Sensors
-- docker-compose.dsmr.yaml
-- docker-compose.esphome.yaml
-- docker-compose.mosquitto.yaml
-
-# Storage
-- docker-compose.seafile.yaml
-- docker-compose.filebrowser.yaml
-- docker-compose.droppy.yaml
-
-# Database
-- docker-compose.pgadmin.yaml
-- docker-compose.postgis.yaml
-- docker-compose.timescaledb.yaml
-- docker-compose.influxdb.yaml