diff --git a/docker/templates/docker-compose.yml b/docker/templates/docker-compose.yml
index ed3fb2a96d7171d2e62b2d1812849cd40c2e1507..3e039a763699162c9f53e84e5e7a78ddfa34d717 100644
--- a/docker/templates/docker-compose.yml
+++ b/docker/templates/docker-compose.yml
@@ -11,12 +11,12 @@
 version: '3.9'
 
 networks:
-  {{APP_NAME}}network:
+  {{APP_NAME}}-network:
 
 services:
 
   # ----- apache httpd + php
-  web-server:
+  {{APP_NAME}}-web-server:
     build:
       context: .
       dockerfile: ./containers/web-server/Dockerfile
@@ -39,17 +39,17 @@ services:
       # start_period: 40s
 
     networks:
-      - {{APP_NAME}}network
+      - {{APP_NAME}}-network
 
     user: ${DOCKER_USER_UID}
 
     # --- 8< --- {{CUTTER_NO_DATABASE}} --- 8< ---
 
     depends_on:
-      - db-server
+      - {{APP_NAME}}-db-server
 
   # ----- mariadb
-  db-server:
+  {{APP_NAME}}-db-server:
     image: {{MYSQL_IMAGE}}
     container_name: '${APP_NAME}-db'
     # restart: always
@@ -68,4 +68,4 @@ services:
       interval: 5s
       retries: 5
     networks:
-      - {{APP_NAME}}network
+      - {{APP_NAME}}-network