diff --git a/awsm/compose.yaml b/awsm/compose.yaml
index 61bbf47..d33abd8 100644
--- a/awsm/compose.yaml
+++ b/awsm/compose.yaml
@@ -1,5 +1,5 @@
 services:
-  awesome:
+  awesome_app:
     image: ${AWESOME_IMAGE:-ghcr.io/valknarness/awesome-app:latest}
     container_name: ${AWESOME_COMPOSE_PROJECT_NAME}_app
     restart: unless-stopped
diff --git a/gotify/compose.yaml b/gotify/compose.yaml
index 7850592..e969bf9 100644
--- a/gotify/compose.yaml
+++ b/gotify/compose.yaml
@@ -1,7 +1,7 @@
 services:
-  gotify:
+  gotify_app:
     image: ${GOTIFY_IMAGE}
-    container_name: ${GOTIFY_COMPOSE_PROJECT_NAME}_gotify
+    container_name: ${GOTIFY_COMPOSE_PROJECT_NAME}_app
     restart: unless-stopped
     volumes:
       - gotify_data:/app/data
diff --git a/proxy/compose.yaml b/proxy/compose.yaml
index 106c22a..3768344 100644
--- a/proxy/compose.yaml
+++ b/proxy/compose.yaml
@@ -1,5 +1,5 @@
 services:
-  traefik:
+  traefik_app:
     image: ${PROXY_DOCKER_IMAGE}
     container_name: ${PROXY_COMPOSE_PROJECT_NAME}_app
     restart: unless-stopped
diff --git a/sexy/compose.yaml b/sexy/compose.yaml
index 0e42030..78f8741 100644
--- a/sexy/compose.yaml
+++ b/sexy/compose.yaml
@@ -1,5 +1,5 @@
 services:
-  directus:
+  sexy_api:
     image: ${SEXY_DIRECTUS_IMAGE}
     container_name: ${SEXY_COMPOSE_PROJECT_NAME}_api
     restart: unless-stopped
@@ -56,7 +56,7 @@ services:
       - 'traefik.http.services.${SEXY_COMPOSE_PROJECT_NAME}-api-web-secure.loadbalancer.server.port=8055'
       - 'traefik.docker.network=${NETWORK_NAME}'
 
-  frontend:
+  sexy_frontend:
     image: ${SEXY_FRONTEND_IMAGE}
     container_name: ${SEXY_COMPOSE_PROJECT_NAME}_frontend
     restart: unless-stopped
diff --git a/track/compose.yaml b/umami/compose.yaml
similarity index 99%
rename from track/compose.yaml
rename to umami/compose.yaml
index b0003c5..643871e 100644
--- a/track/compose.yaml
+++ b/umami/compose.yaml
@@ -1,5 +1,5 @@
 services:
-  umami:
+  umami_app:
     image: ${TRACK_DOCKER_IMAGE}
     container_name: ${TRACK_COMPOSE_PROJECT_NAME}_app
     restart: unless-stopped
diff --git a/vpn/compose.yaml b/vpn/compose.yaml
index f93e753..16745e1 100644
--- a/vpn/compose.yaml
+++ b/vpn/compose.yaml
@@ -1,5 +1,5 @@
 services:
-  wg-easy:
+  vpn_app:
     image: ${VPN_DOCKER_IMAGE}
     container_name: ${VPN_COMPOSE_PROJECT_NAME}_app
     restart: unless-stopped