diff --git a/roles/docker-akaunting/templates/docker-compose.yml.j2 b/roles/docker-akaunting/templates/docker-compose.yml.j2
index 13a852b0..8c97a289 100644
--- a/roles/docker-akaunting/templates/docker-compose.yml.j2
+++ b/roles/docker-akaunting/templates/docker-compose.yml.j2
@@ -12,7 +12,7 @@
       - data:/var/www/html
     environment:
       - AKAUNTING_SETUP
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
diff --git a/roles/docker-attendize/templates/docker-compose.yml.j2 b/roles/docker-attendize/templates/docker-compose.yml.j2
index e447e995..5ffd2786 100644
--- a/roles/docker-attendize/templates/docker-compose.yml.j2
+++ b/roles/docker-attendize/templates/docker-compose.yml.j2
@@ -12,13 +12,13 @@
       worker:
     env_file:
       - ./.env
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
   worker:
     image: "{{ applications[application_id].images.worker }}"
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
       maildev:
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
     volumes:
       - .:/usr/share/nginx/html
       - .:/var/www
diff --git a/roles/docker-baserow/templates/docker-compose.yml.j2 b/roles/docker-baserow/templates/docker-compose.yml.j2
index 1bd43f1f..f5f82517 100644
--- a/roles/docker-baserow/templates/docker-compose.yml.j2
+++ b/roles/docker-baserow/templates/docker-compose.yml.j2
@@ -8,7 +8,7 @@
       - data:/baserow/data
     ports:
       - "{{ports.localhost.http[application_id]}}:80"
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
diff --git a/roles/docker-bluesky/templates/docker-compose.yml.j2 b/roles/docker-bluesky/templates/docker-compose.yml.j2
index ae9566ea..cfdc18de 100644
--- a/roles/docker-bluesky/templates/docker-compose.yml.j2
+++ b/roles/docker-bluesky/templates/docker-compose.yml.j2
@@ -12,7 +12,7 @@
       - "127.0.0.1:{{ports.localhost.http.bluesky_api}}:{{ container_port }}"
 
 {% include 'roles/docker-container/templates/healthcheck/wget.yml.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 #  Deactivated for the moment @see https://github.com/bluesky-social/social-app
   web:
@@ -33,7 +33,7 @@
       interval: 30s
       timeout: 10s
       retries: 3
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   pds_data:
diff --git a/roles/docker-collabora/templates/docker-compose.yml.j2 b/roles/docker-collabora/templates/docker-compose.yml.j2
index 25e3ffb3..0b6382e8 100644
--- a/roles/docker-collabora/templates/docker-compose.yml.j2
+++ b/roles/docker-collabora/templates/docker-compose.yml.j2
@@ -8,6 +8,6 @@
 
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
diff --git a/roles/docker-coturn/templates/docker-compose.yml.j2 b/roles/docker-coturn/templates/docker-compose.yml.j2
index 2716878e..e348002d 100644
--- a/roles/docker-coturn/templates/docker-compose.yml.j2
+++ b/roles/docker-coturn/templates/docker-compose.yml.j2
@@ -11,7 +11,7 @@
       - /etc/localtime:/etc/localtime:ro
 {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
 
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
diff --git a/roles/docker-espocrm/templates/docker-compose.yml.j2 b/roles/docker-espocrm/templates/docker-compose.yml.j2
index 59e1825d..c6c63263 100644
--- a/roles/docker-espocrm/templates/docker-compose.yml.j2
+++ b/roles/docker-espocrm/templates/docker-compose.yml.j2
@@ -6,7 +6,7 @@
     ports:
       - "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
     volumes:
       - data:/var/www/html
 
@@ -16,7 +16,7 @@
     logging:
       driver: journald
     entrypoint: docker-daemon.sh
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
     volumes:
       - data:/var/www/html
 
@@ -32,7 +32,7 @@
       - ESPOCRM_CONFIG_WEB_SOCKET_ZERO_M_Q_SUBMISSION_DSN=tcp://websocket:7777
     entrypoint: docker-websocket.sh
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
     volumes:
       - data:/var/www/html
     ports:
diff --git a/roles/docker-friendica/templates/docker-compose.yml.j2 b/roles/docker-friendica/templates/docker-compose.yml.j2
index f0b981aa..f1d8ff61 100644
--- a/roles/docker-friendica/templates/docker-compose.yml.j2
+++ b/roles/docker-friendica/templates/docker-compose.yml.j2
@@ -10,7 +10,7 @@
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
 
 {% include 'roles/docker-container/templates/healthcheck/msmtp_curl.yml.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
diff --git a/roles/docker-funkwhale/templates/docker-compose.yml.j2 b/roles/docker-funkwhale/templates/docker-compose.yml.j2
index 4567dfc3..de063775 100644
--- a/roles/docker-funkwhale/templates/docker-compose.yml.j2
+++ b/roles/docker-funkwhale/templates/docker-compose.yml.j2
@@ -17,14 +17,14 @@
       - "data:{{funkwhale_media_root}}"
       - "music:{{funkwhale_music_directory_path}}:ro"
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
   celerybeat:
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     image: "{{ applications | get_docker_image(application_id,'api') }}"
     command: celery -A funkwhale_api.taskapp beat --pidfile= -l INFO
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
   api:
 {% include 'roles/docker-container/templates/base.yml.j2' %}
@@ -36,7 +36,7 @@
     ports:
       - "{{ funkwhale_docker_api_port }}"
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
   front:
 {% include 'roles/docker-container/templates/base.yml.j2' %}
diff --git a/roles/docker-gitea/templates/docker-compose.yml.j2 b/roles/docker-gitea/templates/docker-compose.yml.j2
index bb6bf2fd..63c496b7 100644
--- a/roles/docker-gitea/templates/docker-compose.yml.j2
+++ b/roles/docker-gitea/templates/docker-compose.yml.j2
@@ -11,7 +11,7 @@
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
 {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
diff --git a/roles/docker-gitlab/templates/docker-compose.yml.j2 b/roles/docker-gitlab/templates/docker-compose.yml.j2
index 2604edf6..55e14429 100644
--- a/roles/docker-gitlab/templates/docker-compose.yml.j2
+++ b/roles/docker-gitlab/templates/docker-compose.yml.j2
@@ -13,7 +13,7 @@
       - 'data:/var/opt/gitlab'
     shm_size: '256m'
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   redis:
diff --git a/roles/docker-joomla/templates/docker-compose.yml.j2 b/roles/docker-joomla/templates/docker-compose.yml.j2
index 2c1d95ad..e29c7138 100644
--- a/roles/docker-joomla/templates/docker-compose.yml.j2
+++ b/roles/docker-joomla/templates/docker-compose.yml.j2
@@ -6,7 +6,7 @@
       - data:/var/www/html
     ports:
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
diff --git a/roles/docker-keycloak/templates/docker-compose.yml.j2 b/roles/docker-keycloak/templates/docker-compose.yml.j2
index deea0506..70a8fb74 100644
--- a/roles/docker-keycloak/templates/docker-compose.yml.j2
+++ b/roles/docker-keycloak/templates/docker-compose.yml.j2
@@ -10,7 +10,7 @@
     volumes:
       - "{{import_directory_host}}:{{import_directory_docker}}"
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% set container_port = 9000 %}
 {% set container_healthcheck = 'health/live' %}
 {% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}
diff --git a/roles/docker-lam/templates/docker-compose.yml.j2 b/roles/docker-lam/templates/docker-compose.yml.j2
index 86e63773..3276ddde 100644
--- a/roles/docker-lam/templates/docker-compose.yml.j2
+++ b/roles/docker-lam/templates/docker-compose.yml.j2
@@ -6,6 +6,6 @@
     ports:
       - 127.0.0.1:{{ports.localhost.http[application_id]}}:80 
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
\ No newline at end of file
diff --git a/roles/docker-ldap/templates/docker-compose.yml.j2 b/roles/docker-ldap/templates/docker-compose.yml.j2
index 9af903c5..6d343f16 100644
--- a/roles/docker-ldap/templates/docker-compose.yml.j2
+++ b/roles/docker-ldap/templates/docker-compose.yml.j2
@@ -20,7 +20,7 @@
           -b cn=config "(&(objectClass=olcOverlayConfig)(olcOverlay=memberof))" \
         | grep "olcOverlay:" | grep -q "memberof"
         '
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   data:
diff --git a/roles/docker-listmonk/templates/docker-compose.yml.j2 b/roles/docker-listmonk/templates/docker-compose.yml.j2
index daa91813..063e3de0 100644
--- a/roles/docker-listmonk/templates/docker-compose.yml.j2
+++ b/roles/docker-listmonk/templates/docker-compose.yml.j2
@@ -7,7 +7,7 @@
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
     volumes:
       - {{docker_compose.directories.config}}config.toml:/listmonk/config.toml
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
 {% include 'roles/docker-container/templates/healthcheck/wget.yml.j2' %}
 
diff --git a/roles/docker-mailu/templates/docker-compose.yml.j2 b/roles/docker-mailu/templates/docker-compose.yml.j2
index 8564c0b3..5ed286e1 100644
--- a/roles/docker-mailu/templates/docker-compose.yml.j2
+++ b/roles/docker-mailu/templates/docker-compose.yml.j2
@@ -4,7 +4,7 @@
   resolver:
     image: {{docker_source}}/unbound:{{applications.mailu.version}}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
         ipv4_address: {{networks.local.mailu.dns}}
 
   front:
@@ -26,7 +26,7 @@
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
       resolver:
         condition: service_started
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
       webmail:
       radicale:
     dns:
@@ -45,7 +45,7 @@
         condition: service_started
     dns:
       - {{networks.local.mailu.dns}}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
   imap:
     image: {{docker_source}}/dovecot:{{applications.mailu.version}}
@@ -58,7 +58,7 @@
       - resolver
     dns:
       - {{networks.local.mailu.dns}}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
   smtp:
     image: {{docker_source}}/postfix:{{applications.mailu.version}}
@@ -71,7 +71,7 @@
       - resolver
     dns:
       - {{networks.local.mailu.dns}}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
   oletools:
     image: {{docker_source}}/oletools:{{applications.mailu.version}}
@@ -81,7 +81,7 @@
       - resolver
     dns:
       - {{networks.local.mailu.dns}}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
       noinet:
 
   antispam:
@@ -98,7 +98,7 @@
       - resolver
     dns:
       - {{networks.local.mailu.dns}}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
       noinet:  
 
 
@@ -112,7 +112,7 @@
       - resolver
     dns:
       - {{networks.local.mailu.dns}}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
   webdav:
     image: {{docker_source}}/radicale:{{applications.mailu.version}}
@@ -123,7 +123,7 @@
       - resolver
     dns:
       - {{networks.local.mailu.dns}}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
       radicale:
 
   fetchmail:
@@ -138,7 +138,7 @@
       - resolver
     dns:
       - {{networks.local.mailu.dns}}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
   webmail:
     image: {{docker_source}}/webmail:{{applications.mailu.version}}
@@ -152,7 +152,7 @@
       - resolver
     dns:
       - {{networks.local.mailu.dns}}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
       webmail:
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
diff --git a/roles/docker-mastodon/templates/docker-compose.yml.j2 b/roles/docker-mastodon/templates/docker-compose.yml.j2
index a8f360d4..0452f8e5 100644
--- a/roles/docker-mastodon/templates/docker-compose.yml.j2
+++ b/roles/docker-mastodon/templates/docker-compose.yml.j2
@@ -12,7 +12,7 @@
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
     volumes:
       - data:/mastodon/public/system
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
   streaming:
 {% set container_port = 4000 %}
@@ -24,7 +24,7 @@
     ports:
       - "127.0.0.1:{{ports.localhost.websocket[application_id]}}:{{ container_port }}"
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
   sidekiq:
     image: "{{ applications[application_id].images.mastodon }}"
@@ -35,7 +35,7 @@
       - data:/mastodon/public/system
     healthcheck:
       test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   redis:
diff --git a/roles/docker-matomo/templates/docker-compose.yml.j2 b/roles/docker-matomo/templates/docker-compose.yml.j2
index d247bb1e..d3f6d5ab 100644
--- a/roles/docker-matomo/templates/docker-compose.yml.j2
+++ b/roles/docker-matomo/templates/docker-compose.yml.j2
@@ -8,7 +8,7 @@
     volumes:
       - data:/var/www/html
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   data:
diff --git a/roles/docker-matrix/templates/docker-compose.yml.j2 b/roles/docker-matrix/templates/docker-compose.yml.j2
index 824eff1e..a2b57fc4 100644
--- a/roles/docker-matrix/templates/docker-compose.yml.j2
+++ b/roles/docker-matrix/templates/docker-compose.yml.j2
@@ -27,7 +27,7 @@
 {% else %}
 {% endif %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
   element:
 {% set container_port = 80 %}
     image: "{{ applications[application_id].images.element }}"
@@ -38,7 +38,7 @@
     ports:
       - "127.0.0.1:{{ports.localhost.http.element}}:{{ container_port }}"
 {% include 'roles/docker-container/templates/healthcheck/wget.yml.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% for item in bridges %}
   mautrix-{{item.bridge_name}}:
@@ -52,7 +52,7 @@
       interval: 1m
       timeout: 10s
       retries: 3
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% endfor %}
 {% if applications[application_id].plugins.chatgpt | bool %}
   matrix-chatgpt-bot:
diff --git a/roles/docker-mediawiki/templates/docker-compose.yml.j2 b/roles/docker-mediawiki/templates/docker-compose.yml.j2
index 87dbaa37..17a1f8ae 100644
--- a/roles/docker-mediawiki/templates/docker-compose.yml.j2
+++ b/roles/docker-mediawiki/templates/docker-compose.yml.j2
@@ -9,7 +9,7 @@
         - "mediawiki-data:/var/www/html/"
       ports:
         - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
diff --git a/roles/docker-mobilizon/templates/docker-compose.yml.j2 b/roles/docker-mobilizon/templates/docker-compose.yml.j2
index c0457239..6a43e372 100644
--- a/roles/docker-mobilizon/templates/docker-compose.yml.j2
+++ b/roles/docker-mobilizon/templates/docker-compose.yml.j2
@@ -9,7 +9,7 @@
 {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   uploads:
diff --git a/roles/docker-moodle/templates/docker-compose.yml.j2 b/roles/docker-moodle/templates/docker-compose.yml.j2
index 1f6d5c87..ec88e9a3 100644
--- a/roles/docker-moodle/templates/docker-compose.yml.j2
+++ b/roles/docker-moodle/templates/docker-compose.yml.j2
@@ -15,7 +15,7 @@
       - 'data:{{ bitnami_data_dir }}'
 {% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   code:
diff --git a/roles/docker-mybb/templates/docker-compose.yml.j2 b/roles/docker-mybb/templates/docker-compose.yml.j2
index bd3fbddd..594df80e 100644
--- a/roles/docker-mybb/templates/docker-compose.yml.j2
+++ b/roles/docker-mybb/templates/docker-compose.yml.j2
@@ -9,7 +9,7 @@
     volumes:
       - data:/var/www/html
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
   server:
     logging:
@@ -23,7 +23,7 @@
     volumes:
     - "{{docker_compose_instance_confd_directory}}:{{target_mount_conf_d_directory}}:ro"
     - "data:/var/www/html:ro"
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   data:
diff --git a/roles/docker-nextcloud/templates/docker-compose.yml.j2 b/roles/docker-nextcloud/templates/docker-compose.yml.j2
index 029bebdb..65ff974c 100644
--- a/roles/docker-nextcloud/templates/docker-compose.yml.j2
+++ b/roles/docker-nextcloud/templates/docker-compose.yml.j2
@@ -13,7 +13,7 @@
       retries: 3
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
         ipv4_address: 192.168.102.69
 
   # @Todo activate
@@ -71,7 +71,7 @@
       timeout: 10s
       retries: 3
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
         ipv4_address: 192.168.102.70
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
diff --git a/roles/docker-openproject/templates/docker-compose.yml.j2 b/roles/docker-openproject/templates/docker-compose.yml.j2
index 0a4139a2..3cabae3f 100644
--- a/roles/docker-openproject/templates/docker-compose.yml.j2
+++ b/roles/docker-openproject/templates/docker-compose.yml.j2
@@ -34,7 +34,7 @@ x-op-app: &app
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     command: "./docker/prod/web"
     container_name: openproject-web
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
       cache:
         condition: service_started
@@ -52,7 +52,7 @@ x-op-app: &app
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     command: "./docker/prod/worker"
     container_name: openproject-worker
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
       cache:
         condition: service_started
@@ -68,7 +68,7 @@ x-op-app: &app
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     command: "./docker/prod/cron"
     container_name: openproject-cron
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
       cache:
         condition: service_started
@@ -87,7 +87,7 @@ x-op-app: &app
     logging:
       driver: journald
     restart: on-failure
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
     volumes:
       - "data:/var/openproject/assets"
       - "{{dummy_volume}}:/var/openproject/pgdata" # This mount is unnecessary and just done to prevent anonymous volumes
diff --git a/roles/docker-peertube/templates/docker-compose.yml.j2 b/roles/docker-peertube/templates/docker-compose.yml.j2
index 0c4b8e0d..9d449631 100644
--- a/roles/docker-peertube/templates/docker-compose.yml.j2
+++ b/roles/docker-peertube/templates/docker-compose.yml.j2
@@ -13,7 +13,7 @@
       - data:/data
       - config:/config
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
     healthcheck:
       # This just tests if the service is running on port 9000. It doesn't check if there is an 200 or e.g. an 404 response
 {% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}
diff --git a/roles/docker-pgadmin/templates/docker-compose.yml.j2 b/roles/docker-pgadmin/templates/docker-compose.yml.j2
index 3e306c67..56f8ad53 100644
--- a/roles/docker-pgadmin/templates/docker-compose.yml.j2
+++ b/roles/docker-pgadmin/templates/docker-compose.yml.j2
@@ -8,7 +8,7 @@
     ports:
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/healthcheck/wget.yml.j2' %}
     volumes:
       - "data:/var/lib/pgadmin"
diff --git a/roles/docker-phpldapadmin/templates/docker-compose.yml.j2 b/roles/docker-phpldapadmin/templates/docker-compose.yml.j2
index a5652cbd..35757bf0 100644
--- a/roles/docker-phpldapadmin/templates/docker-compose.yml.j2
+++ b/roles/docker-phpldapadmin/templates/docker-compose.yml.j2
@@ -7,7 +7,7 @@
       - 127.0.0.1:{{ports.localhost.http[application_id]}}:8080
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   data:
diff --git a/roles/docker-phpmyadmin/templates/docker-compose.yml.j2 b/roles/docker-phpmyadmin/templates/docker-compose.yml.j2
index 13c9085b..d3956d6a 100644
--- a/roles/docker-phpmyadmin/templates/docker-compose.yml.j2
+++ b/roles/docker-phpmyadmin/templates/docker-compose.yml.j2
@@ -8,7 +8,7 @@
     ports:
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
\ No newline at end of file
diff --git a/roles/docker-pixelfed/templates/docker-compose.yml.j2 b/roles/docker-pixelfed/templates/docker-compose.yml.j2
index 8ca7f25b..7dd67b44 100644
--- a/roles/docker-pixelfed/templates/docker-compose.yml.j2
+++ b/roles/docker-pixelfed/templates/docker-compose.yml.j2
@@ -9,7 +9,7 @@
     ports:
       - "{{ports.localhost.http[application_id]}}:80"
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
   worker:
     image: "{{ applications[application_id].images.pixelfed }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
@@ -25,7 +25,7 @@
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
       application:
         condition: service_started
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   redis:
diff --git a/roles/docker-portfolio/templates/docker-compose.yml.j2 b/roles/docker-portfolio/templates/docker-compose.yml.j2
index 00eba3e2..9f071503 100644
--- a/roles/docker-portfolio/templates/docker-compose.yml.j2
+++ b/roles/docker-portfolio/templates/docker-compose.yml.j2
@@ -11,7 +11,7 @@
     volumes:
       - {{docker_repository_path}}app:/app
     restart: unless-stopped
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
\ No newline at end of file
diff --git a/roles/docker-presentation/templates/docker-compose.yml.j2 b/roles/docker-presentation/templates/docker-compose.yml.j2
index 9ac2d630..890ea8d9 100644
--- a/roles/docker-presentation/templates/docker-compose.yml.j2
+++ b/roles/docker-presentation/templates/docker-compose.yml.j2
@@ -9,7 +9,7 @@
       - {{ path_cymais_presentation_output.stdout }}:/app
       - {{ path_cymais_output.stdout }}:/source
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
 
diff --git a/roles/docker-simpleicons/templates/docker-compose.yml.j2 b/roles/docker-simpleicons/templates/docker-compose.yml.j2
index 59d64c8f..83575766 100644
--- a/roles/docker-simpleicons/templates/docker-compose.yml.j2
+++ b/roles/docker-simpleicons/templates/docker-compose.yml.j2
@@ -8,7 +8,7 @@
     ports:
       - "{{ports.localhost.http[application_id]}}:3000"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
 
diff --git a/roles/docker-snipe-it/templates/docker-compose.yml.j2 b/roles/docker-snipe-it/templates/docker-compose.yml.j2
index 99ad7509..e95df297 100644
--- a/roles/docker-snipe-it/templates/docker-compose.yml.j2
+++ b/roles/docker-snipe-it/templates/docker-compose.yml.j2
@@ -9,7 +9,7 @@
     ports:
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   redis:
diff --git a/roles/docker-sphinx/templates/docker-compose.yml.j2 b/roles/docker-sphinx/templates/docker-compose.yml.j2
index 17657d21..8c6ee57e 100644
--- a/roles/docker-sphinx/templates/docker-compose.yml.j2
+++ b/roles/docker-sphinx/templates/docker-compose.yml.j2
@@ -8,6 +8,6 @@
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
 {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
diff --git a/roles/docker-taiga/templates/docker-compose-inits.yml.j2 b/roles/docker-taiga/templates/docker-compose-inits.yml.j2
index b0762f87..74a959bf 100644
--- a/roles/docker-taiga/templates/docker-compose-inits.yml.j2
+++ b/roles/docker-taiga/templates/docker-compose-inits.yml.j2
@@ -4,7 +4,7 @@ services:
     environment:
       CELERY_ENABLED: "False"
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
     entrypoint: "python manage.py"
     volumes:
       - static-data:/taiga-back/static
diff --git a/roles/docker-taiga/templates/docker-compose.yml.j2 b/roles/docker-taiga/templates/docker-compose.yml.j2
index 0ebc690d..613fe67a 100644
--- a/roles/docker-taiga/templates/docker-compose.yml.j2
+++ b/roles/docker-taiga/templates/docker-compose.yml.j2
@@ -15,7 +15,7 @@
 
 {% endif %}
 
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
       taiga:
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
       taiga-events-rabbitmq:
@@ -50,7 +50,7 @@
 
 {% endif %}
 
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
       taiga:
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
       taiga-events-rabbitmq:
@@ -72,13 +72,13 @@
     volumes:
       - async-rabbitmq-data:/var/lib/rabbitmq
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
       taiga:
 
   taiga-front:
     image: {{taiga_image_frontend}}:{{applications.taiga.version}}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
       taiga:
 #    volumes:
 #      - {{ taiga_frontend_conf_path }}:/usr/share/nginx/html/conf.json:ro
@@ -86,7 +86,7 @@
   taiga-events:
     image: taigaio/taiga-events:latest
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
       taiga:
     depends_on:
       taiga-events-rabbitmq:
@@ -99,14 +99,14 @@
       - events-rabbitmq-data:/var/lib/rabbitmq
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
       taiga:
 
   taiga-protected:
     image: taigaio/taiga-protected:latest
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
       taiga:
 
   taiga-gateway:
@@ -119,7 +119,7 @@
       - media-data:/taiga/media
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
       taiga:
     depends_on:
       - taiga-front
diff --git a/roles/docker-wordpress/templates/docker-compose.yml.j2 b/roles/docker-wordpress/templates/docker-compose.yml.j2
index daaf1c66..8fe1f80e 100644
--- a/roles/docker-wordpress/templates/docker-compose.yml.j2
+++ b/roles/docker-wordpress/templates/docker-compose.yml.j2
@@ -12,7 +12,7 @@
 
 {% include 'roles/docker-container/templates/healthcheck/msmtp_curl.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
 
diff --git a/roles/docker-yourls/templates/docker-compose.yml.j2 b/roles/docker-yourls/templates/docker-compose.yml.j2
index 9b70cc4c..d76921be 100644
--- a/roles/docker-yourls/templates/docker-compose.yml.j2
+++ b/roles/docker-yourls/templates/docker-compose.yml.j2
@@ -10,7 +10,7 @@
 {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
 
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes-just-database.yml.j2' %}
 
diff --git a/templates/docker_role/templates/docker-compose.yml.j2.j2 b/templates/docker_role/templates/docker-compose.yml.j2.j2
index 192c8275..9ce42407 100644
--- a/templates/docker_role/templates/docker-compose.yml.j2.j2
+++ b/templates/docker_role/templates/docker-compose.yml.j2.j2
@@ -4,15 +4,13 @@ services:
 
   application:
     image: "{{ applications[application_id].images[application_id] }}"
-    volumes:
-      - uploads:/var/lib/mobilizon/uploads
-      - {{ mobilizon_host_conf_exs_file }}:/etc/mobilizon/config.exs:ro
+    volumes: []
     ports:
       - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
 {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   uploads:
diff --git a/tests/integration/test_docker_compose_templates.py b/tests/integration/test_docker_compose_templates.py
index ac7b0603..6e08aa16 100644
--- a/tests/integration/test_docker_compose_templates.py
+++ b/tests/integration/test_docker_compose_templates.py
@@ -22,7 +22,7 @@ class TestDockerComposeTemplates(unittest.TestCase):
     def test_docker_compose_includes(self):
         """
         Verifies for each found docker-compose.yml.j2:
-        1. BASE_INCLUDE and NET_INCLUDE are present
+        1. BASE_INCLUDE and NET_INCLUDE are present exactly once
         2. BASE_INCLUDE appears before NET_INCLUDE
         3. Only allowed lines appear before BASE_INCLUDE (invalid lines issue warnings)
         """
@@ -36,17 +36,24 @@ class TestDockerComposeTemplates(unittest.TestCase):
                 content = template_path.read_text(encoding='utf-8')
                 lines = content.splitlines()
 
-                # Find BASE_INCLUDE
-                try:
-                    idx_base = lines.index(self.BASE_INCLUDE)
-                except ValueError:
-                    self.fail(f"{template_path}: '{self.BASE_INCLUDE}' not found")
+                # Check each include occurs exactly once
+                count_base = lines.count(self.BASE_INCLUDE)
+                self.assertEqual(
+                    count_base,
+                    1,
+                    f"{template_path}: '{self.BASE_INCLUDE}' occurs {count_base} times, expected once"
+                )
+                count_net = lines.count(self.NET_INCLUDE)
+                self.assertEqual(
+                    count_net,
+                    1,
+                    f"{template_path}: '{self.NET_INCLUDE}' occurs {count_net} times, expected once"
+                )
 
-                # Find NET_INCLUDE
-                try:
-                    idx_net = lines.index(self.NET_INCLUDE)
-                except ValueError:
-                    self.fail(f"{template_path}: '{self.NET_INCLUDE}' not found")
+                # Find BASE_INCLUDE index
+                idx_base = lines.index(self.BASE_INCLUDE)
+                # Find NET_INCLUDE index
+                idx_net = lines.index(self.NET_INCLUDE)
 
                 # Check order
                 self.assertLess(