diff --git a/ai/compose.yml b/ai/compose.yml
index d322d0b..460d44d 100644
--- a/ai/compose.yml
+++ b/ai/compose.yml
@@ -1,13 +1,16 @@
+version: "3.8"
 services:
 
   webui:
     image: ghcr.io/open-webui/open-webui:main
     volumes:
       - /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
+    restart: always
     environment:
       - OLLAMA_API_BASE_URL=http://ollama:11434/api
     networks:
-      - traefik-net
+      - ai_net
+      - ai_backend
     labels:
       - "traefik.enable=true"
 
@@ -22,10 +25,76 @@ services:
       - "traefik.http.routers.webui-https.tls=true"
       - "traefik.http.routers.webui-https.tls.certresolver=njalla"
 
+  hermes:
+    image: nousresearch/hermes-agent:latest
+    container_name: hermes
+    restart: always
+    # Gateway run enables the internal API server on port 8642
+    command: gateway run
+    environment:
+      - OLLAMA_HOST=http://ollama:11434
+      - API_SERVER_ENABLED=true
+      - API_SERVER_PORT=8642
+      - API_SERVER_HOST=0.0.0.0
+      - API_SERVER_KEY=hermes_local_key
+      - GATEWAY_ALLOW_ALL_USERS=true
+      - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
+    volumes:
+      - /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
+    devices:
+      - /dev/kfd:/dev/kfd
+      - /dev/dri:/dev/dri
+    group_add:
+      - "303"
+      - "26"
+    networks:
+      - ai_backend
+
+  ollama:
+    image: ollama/ollama:latest
+    container_name: ollama
+    privileged: true
+    tty: true
+    restart: always 
+    ports:
+      - "127.0.0.1:11434:11434"
+    networks:
+      - ai_backend
+    volumes:
+      - /mnt/HoardingCow_docker_data/Ollama/ollama:/root/.ollama
+    environment:
+      - OLLAMA_VULKAN=0
+      - HSA_OVERRIDE_GFX_VERSION=9.0.6
+      - HCC_AMDGPU_TARGET=gfx906
+      - HIP_VISIBLE_DEVICES=0,1
+      - ROCR_VISIBLE_DEVICES=0,1
+      - HSA_ENABLE_SDMA=0 
+      - OLLAMA_HOST=0.0.0.0
+      - OLLAMA_DEBUG=1
+      - OLLAMA_FLASH_ATTENTION=0
+      - OLLAMA_NUM_PARALLEL=2
+    devices:
+      # Map the render nodes and KFD for ROCm to work inside the container
+      - /dev/kfd:/dev/kfd
+      - /dev/dri:/dev/dri
+    group_add:
+      - "303"
+      - "26"
+
+networks:
+  ai_net:
+    external: true
+    name: ai_net
+  ai_backend:
+    driver: bridge
+    name: ai_backend
+    
   # llama_cpp_devstral:
   #   image: ghcr.io/ggml-org/llama.cpp:server-rocm
   #   container_name: llama_cpp_devstral
   #   restart: unless-stopped
+  #   networks:
+  #     - ai_backend
   #   ports:
   #     - "8300:8080"
   #   ipc: host
@@ -70,7 +139,7 @@ services:
   #   init: true
   #   shm_size: '2g' 
   #   networks:
-  #     - traefik-net
+  #     - ai_backend
   #   ports:
   #     - "8300:8000"
   #   devices:
@@ -108,43 +177,12 @@ services:
   #     - /mnt/HoardingCow_docker_data/vllm/models:/root/.cache/huggingface
   #   restart: unless-stopped
 
-  ollama:
-    image: ollama/ollama:latest
-    container_name: ollama
-    privileged: true
-    tty: true
-    restart: unless-stopped
-    ports:
-      - "127.0.0.1:11434:11434"
-    networks:
-      - traefik-net
-    volumes:
-      - /mnt/HoardingCow_docker_data/Ollama/ollama:/root/.ollama
-    environment:
-      - OLLAMA_VULKAN=0
-      - HSA_OVERRIDE_GFX_VERSION=9.0.6
-      - HCC_AMDGPU_TARGET=gfx906
-      - HIP_VISIBLE_DEVICES=0,1
-      - ROCR_VISIBLE_DEVICES=0,1
-      - HSA_ENABLE_SDMA=0 
-      - OLLAMA_HOST=0.0.0.0
-      - OLLAMA_DEBUG=1
-      - OLLAMA_FLASH_ATTENTION=0
-      - OLLAMA_NUM_PARALLEL=2
-    devices:
-      # Map the render nodes and KFD for ROCm to work inside the container
-      - /dev/kfd:/dev/kfd
-      - /dev/dri:/dev/dri
-    group_add:
-      - "303"
-      - "26"
-
   # n8n:
   #   image: n8nio/n8n:latest
   #   container_name: n8n
   #   restart: unless-stopped
   #   networks:
-  #     - traefik-net
+  #     - ai_net
   #   environment:
   #     - N8N_HOST=n8n.lazyworkhorse.net
   #     - N8N_PORT=5678
@@ -177,62 +215,79 @@ services:
 
   #     # Service Loadbalancer (n8n default port)
   #     - "traefik.http.services.n8n.loadbalancer.server.port=5678"
-       
-  openclaw:
-    image: coollabsio/openclaw:latest
-    container_name: openclaw
-    restart: unless-stopped
-    expose:
-      - "8080"  # WebUI
-      - "18789" # Gateway/WebSocket
-      - "8788"  # Nextcloud Webhook
-    networks:
-      - traefik-net
-    volumes:
-      - /mnt/HoardingCow_docker_data/openclaw/data:/data
-      - /home/gortium/infra:/data/workspace/infra
-    environment:
-      - TZ=America/Toronto
-      - OPENCLAW_GATEWAY_TOKEN=${OPENCLAW_GATEWAY_TOKEN}
-      - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
-      # Point to the sidecar browser
-      - BROWSER_CDP_URL=http://openclaw-browser:9222
-      - BROWSER_EVALUATE_ENABLED=true
-      - OPENCLAW_GATEWAY_HOST=0.0.0.0
-      - OPENCLAW_ALLOWED_ORIGINS=https://claw.lazyworkhorse.net
 
-    labels:
-      - "traefik.enable=true"
+  # openclaw:
+  #   image: coollabsio/openclaw:latest
+  #   container_name: openclaw
+  #   restart: unless-stopped
+  #   expose:
+  #     - "8080"  # WebUI
+  #     - "18789" # Gateway/WebSocket
+  #     - "8788"  # Nextcloud Webhook
+  #   networks:
+  #     - ai_net
+  #     - ai_backend
+  #   volumes:
+  #     - /mnt/HoardingCow_docker_data/openclaw/data:/data
+  #     - /home/gortium/infra:/data/workspace/infra
+  #   environment:
+  #     - TZ=America/Toronto
+  #     - OPENCLAW_GATEWAY_TOKEN=${OPENCLAW_GATEWAY_TOKEN}
+  #     - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
+  #     # Point to the sidecar browser
+  #     - BROWSER_CDP_URL=http://openclaw-browser:9222
+  #     - BROWSER_EVALUATE_ENABLED=true
+  #     - OPENCLAW_GATEWAY_HOST=0.0.0.0
+  #     - OPENCLAW_ALLOWED_ORIGINS=https://claw.lazyworkhorse.net
+  #   labels:
+  #     - "traefik.enable=true"
 
-      - "traefik.http.routers.openclaw-http.rule=Host(`claw.lazyworkhorse.net`)"
-      - "traefik.http.routers.openclaw-http.entrypoints=web"
-      - "traefik.http.routers.openclaw-http.middlewares=redirect-to-https"
+  #     - "traefik.http.routers.openclaw-http.rule=Host(`claw.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.openclaw-http.entrypoints=web"
+  #     - "traefik.http.routers.openclaw-http.middlewares=redirect-to-https"
 
-      - "traefik.http.routers.openclaw-https.rule=Host(`claw.lazyworkhorse.net`)"
-      - "traefik.http.routers.openclaw-https.priority=50"
-      - "traefik.http.routers.openclaw-https.entrypoints=websecure"
-      - "traefik.http.routers.openclaw-https.tls=true"
-      - "traefik.http.routers.openclaw-https.tls.certresolver=njalla"
-      - "traefik.http.services.openclaw.loadbalancer.server.port=8080"
+  #     - "traefik.http.routers.openclaw-https.rule=Host(`claw.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.openclaw-https.priority=50"
+  #     - "traefik.http.routers.openclaw-https.entrypoints=websecure"
+  #     - "traefik.http.routers.openclaw-https.tls=true"
+  #     - "traefik.http.routers.openclaw-https.tls.certresolver=njalla"
+  #     - "traefik.http.services.openclaw.loadbalancer.server.port=8080"
+  #   depends_on:
+  #     - openclaw-browser
 
-    depends_on:
-      - openclaw-browser
+  # openclaw-browser:
+  #   image: ghcr.io/browserless/chromium:latest
+  #   restart: always
+  #   expose:
+  #     - "3000"
+  #   environment:
+  #     - MAX_CONCURRENT_SESSIONS=10
+  #     - CONNECTION_TIMEOUT=300000
+  #     - PREBOOT_CHROME=true
+  #     - DEMO_MODE=false
+  #   networks:
+  #     ai_backend:
+  #       aliases:
+  #         - browser
 
-  openclaw-browser:
-    image: ghcr.io/browserless/chromium:latest
-    restart: always
-    expose:
-      - "3000"
-    environment:
-      - MAX_CONCURRENT_SESSIONS=10
-      - CONNECTION_TIMEOUT=300000
-      - PREBOOT_CHROME=true
-      - DEMO_MODE=false
-    networks:
-      traefik-net:
-        aliases:
-          - browser
-
-networks:
-  traefik-net:
-    external: true
+  # openclaw-ssh:
+  #   image: linuxserver/openssh-server:latest
+  #   container_name: openclaw-ssh
+  #   environment:
+  #     - PUID=1000
+  #     - PGID=1000
+  #     - PUBLIC_KEY_FILE=/config/ssh/authorized_keys
+  #     - SUDO_ACCESS=false
+  #     - PASSWORD_ACCESS=false
+  #   volumes:
+  #     - /mnt/HoardingCow_docker_data/openclaw/ssh-config:/config
+  #     - /home/gortium/infra:/data/workspace/infra:ro
+  #   restart: unless-stopped
+  #   networks:
+  #     - ai_backend
+  #   labels:
+  #     - "traefik.enable=true"
+  #     - "traefik.tcp.routers.openclaw-ssh.rule=HostSNI(*)"
+  #     - "traefik.tcp.routers.openclaw-ssh.entrypoints=sshnode"
+  #     - "traefik.tcp.routers.openclaw-ssh.tls.passthrough=false"
+  #     - "traefik.tcp.services.openclaw-ssh.loadbalancer.server.port=2222"
diff --git a/authentification/compose.yml b/authentification/compose.yml
index f8a60be..c50c795 100644
--- a/authentification/compose.yml
+++ b/authentification/compose.yml
@@ -7,8 +7,8 @@ services:
     volumes:
       - /mnt/HoardingCow_docker_data/Authelia:/config
     networks:
-      - traefik-net
-    restart: unless-stopped
+      - auth_net
+    restart: always 
     labels:
       - "traefik.enable=true"
 
@@ -31,5 +31,6 @@ services:
       - "traefik.http.middlewares.authelia.forwardauth.authResponseHeaders=Remote-User,Remote-Groups,Remote-Name,Remote-Email"
 
 networks:
-  traefik-net:
+  auth_net:
     external: true
+    name: auth_net
diff --git a/backup/compose.yml b/backup/compose.yml
index d25fc44..990efc4 100644
--- a/backup/compose.yml
+++ b/backup/compose.yml
@@ -1,55 +1,100 @@
 version: "3.8"
 
 services:
-  kopia:
-    image: kopia/kopia:latest
-    container_name: kopia
-    restart: unless-stopped
-    # We explicitly run as root (0:0) to solve the CHDIR issue, 
-    # OR we make sure the host folders match UID 1000.
-    user: "0:0" 
-    command:
-      - server
-      - start
-      - --address=0.0.0.0:51515
-      - --server-username=${KOPIA_SERVER_USER}
-      - --server-password=${KOPIA_SERVER_PASSWORD}
-      - --config-file=/app/config/repository.config
-      - --disable-csrf-token-checks
-      - --insecure
+  # kopia:
+  #   image: kopia/kopia:latest
+  #   container_name: kopia
+  #   restart: unless-stopped
+  #   # We explicitly run as root (0:0) to solve the CHDIR issue, 
+  #   # OR we make sure the host folders match UID 1000.
+  #   user: "0:0" 
+  #   command:
+  #     - server
+  #     - start
+  #     - --address=0.0.0.0:51515
+  #     - --server-username=${KOPIA_SERVER_USER}
+  #     - --server-password=${KOPIA_SERVER_PASSWORD}
+  #     - --config-file=/app/config/repository.config
+  #     - --disable-csrf-token-checks
+  #     - --insecure
+  #   environment:
+  #     - TZ=America/Montreal
+  #     - KOPIA_PASSWORD=${KOPIA_PASSWORD}
+  #     - USER=${KOPIA_USER}
+  #   volumes:
+  #     - /mnt/HoardingCow_docker_data/Kopia/config:/app/config
+  #     - /mnt/HoardingCow_docker_data/Kopia/cache:/app/cache
+  #     - /mnt/HoardingCow_docker_data/Kopia/repository:/repository
+  #     # Required if you want to use the 'Mount' feature later
+  #     - /tmp:/tmp:shared
+  #     # Required for mounting backups as drives
+  #   cap_add:
+  #     - SYS_ADMIN
+  #   devices:
+  #     - /dev/fuse:/dev/fuse
+  #   networks:
+  #     - traefik-net
+  #   labels:
+  #     - "traefik.enable=true"
+  #     # 1. HTTP to HTTPS Redirect
+  #     - "traefik.http.routers.kopia-http.rule=Host(`backup.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.kopia-http.entrypoints=web"
+  #     - "traefik.http.routers.kopia-http.middlewares=redirect-to-https@docker"
+  #     
+  #     # 2. HTTPS Configuration
+  #     - "traefik.http.routers.kopia.rule=Host(`backup.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.kopia.entrypoints=websecure"
+  #     - "traefik.http.routers.kopia.tls=true"
+  #     - "traefik.http.routers.kopia.tls.certresolver=njalla"
+  #     
+  #     # 3. Backend Service Config
+  #     - "traefik.http.services.kopia.loadbalancer.server.port=51515"
+
+  restic-server:
+    image: restic/restic:latest
+    container_name: restic-server
+    restart: always 
+    user: "0:0"
+    command: ["server", "--listen", ":8080", "--repo", "/data", "--tls-cert", "", "--tls-key", ""]
     environment:
       - TZ=America/Montreal
-      - KOPIA_PASSWORD=${KOPIA_PASSWORD}
-      - USER=${KOPIA_USER}
+      - RESTIC_PASSWORD=${RESTIC_PASSWORD}
     volumes:
-      - /mnt/HoardingCow_docker_data/Kopia/config:/app/config
-      - /mnt/HoardingCow_docker_data/Kopia/cache:/app/cache
-      - /mnt/HoardingCow_docker_data/Kopia/repository:/repository
-      # Required if you want to use the 'Mount' feature later
-      - /tmp:/tmp:shared
-      # Required for mounting backups as drives
-    cap_add:
-      - SYS_ADMIN
-    devices:
-      - /dev/fuse:/dev/fuse
+      - /mnt/HoardingCow_docker_data/Restic/data:/data
+      # Mount paths to backup (adjust as needed)
+      - /mnt/HoardingCow_docker_data:/source:ro
     networks:
-      - traefik-net
+      - backup_net
+    labels:
+      - "traefik.enable=false" # Internal only, accessed by restic-browser
+
+  restic-browser:
+    image: embergarage/restic-browser:latest
+    container_name: restic-browser
+    restart: always 
+    environment:
+      - TZ=America/Montreal
+      - RESTIC_REPOSITORY=http://restic-server:8080
+      - RESTIC_PASSWORD=${RESTIC_PASSWORD}
+    networks:
+      - backup_net
     labels:
       - "traefik.enable=true"
       # 1. HTTP to HTTPS Redirect
-      - "traefik.http.routers.kopia-http.rule=Host(`backup.lazyworkhorse.net`)"
-      - "traefik.http.routers.kopia-http.entrypoints=web"
-      - "traefik.http.routers.kopia-http.middlewares=redirect-to-https@docker"
+      - "traefik.http.routers.restic-browser-http.rule=Host(`backup.lazyworkhorse.net`)"
+      - "traefik.http.routers.restic-browser-http.entrypoints=web"
+      - "traefik.http.routers.restic-browser-http.middlewares=redirect-to-https@docker"
       
       # 2. HTTPS Configuration
-      - "traefik.http.routers.kopia.rule=Host(`backup.lazyworkhorse.net`)"
-      - "traefik.http.routers.kopia.entrypoints=websecure"
-      - "traefik.http.routers.kopia.tls=true"
-      - "traefik.http.routers.kopia.tls.certresolver=njalla"
+      - "traefik.http.routers.restic-browser.rule=Host(`backup.lazyworkhorse.net`)"
+      - "traefik.http.routers.restic-browser.entrypoints=websecure"
+      - "traefik.http.routers.restic-browser.tls=true"
+      - "traefik.http.routers.restic-browser.tls.certresolver=njalla"
       
       # 3. Backend Service Config
-      - "traefik.http.services.kopia.loadbalancer.server.port=51515"
+      - "traefik.http.services.restic-browser.loadbalancer.server.port=8000"
 
 networks:
-  traefik-net:
+  backup_net:
     external: true
+    name: backup_net
diff --git a/cloudstorage/compose.yml b/cloudstorage/compose.yml
index 2e1ab88..a5c1114 100644
--- a/cloudstorage/compose.yml
+++ b/cloudstorage/compose.yml
@@ -5,7 +5,7 @@ services:
     container_name: nextcloud
     restart: always
     networks:
-      - traefik-net
+      - cloud_net
     environment:
       - PUID=1000
       - PGID=1000
@@ -49,9 +49,9 @@ services:
   nextcloud_cron:
     image: nextcloud:latest
     container_name: nextcloud_cron
-    restart: always
+    restart: always 
     networks:
-      - traefik-net
+      - cloud_net
     entrypoint: /cron.sh
     volumes:
       - /mnt/HoardingCow_docker_data/NextCloud/data:/var/www/html:rw
@@ -61,9 +61,9 @@ services:
   nextcloud_mariadb:
     image: mariadb:latest
     container_name: nextcloud_mariadb
-    restart: always
+    restart: unless-stopped
     networks:
-      - traefik-net
+      - cloud_internal
     environment:
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
       - MYSQL_USER=nextcloud
@@ -74,5 +74,9 @@ services:
     # command: ["--innodb-force-recovery=6"]
 
 networks:
-  traefik-net:
+  cloud_net:
     external: true
+    name: cloud_net
+  cloud_internal:
+    driver: bridge
+    name: cloud_internal
diff --git a/coms/compose.yml b/coms/compose.yml
index fd290cd..1036a7a 100644
--- a/coms/compose.yml
+++ b/coms/compose.yml
@@ -3,7 +3,7 @@ services:
   nomadnet:
     image: ghcr.io/markqvist/nomadnet:master
     container_name: nomadnet
-    restart: unless-stopped
+    restart: always
     volumes:
       - /mnt/HoardingCow_docker_data/Nomadnet:/root/.nomadnetwork
       - /mnt/HoardingCow_docker_data/Reticulum:/root/.reticulum
@@ -11,6 +11,66 @@ services:
     ports:
       - "4242:4242"
 
+  synapse:
+    image: ghcr.io/element-hq/synapse:latest
+    container_name: synapse
+    restart: always
+    volumes:
+      - /mnt/HoardingCow_docker_data/Matrix/data:/data
+    networks:
+      - coms_net
+      - coms_backend
+    depends_on:
+      synapse-db:
+        condition: service_healthy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.matrix-http.rule=Host(`matrix.lazyworkhorse.net`)"
+      - "traefik.http.routers.matrix-http.entrypoints=web"
+      - "traefik.http.routers.matrix-http.middlewares=redirect-to-https"
+      - "traefik.http.routers.matrix-https.rule=Host(`matrix.lazyworkhorse.net`)"
+      - "traefik.http.routers.matrix-https.entrypoints=websecure"
+      - "traefik.http.routers.matrix-https.tls=true"
+      - "traefik.http.routers.matrix-https.tls.certresolver=njalla"
+      - "traefik.http.services.matrix-https.loadbalancer.server.port=8008"
+      - "traefik.docker.network=coms_net"
+
+  synapse-db:
+    image: postgres:17-alpine
+    container_name: synapse-db
+    restart: always
+    environment:
+      - POSTGRES_USER=synapse
+      - POSTGRES_PASSWORD=${SYNAPSE_DB_PASSWORD}
+      - POSTGRES_DB=synapse
+      - POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C
+    volumes:
+      - /mnt/HoardingCow_docker_data/Matrix/db:/var/lib/postgresql/data
+    networks:
+      - coms_backend
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U synapse"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+      
+  synapse-admin:
+    image: awesometechnologies/synapse-admin:latest
+    container_name: synapse-admin
+    restart: always
+    networks:
+      - coms_net
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.synapse-admin-http.rule=Host(`synadm.lazyworkhorse.net`)"
+      - "traefik.http.routers.synapse-admin-http.entrypoints=web"
+      - "traefik.http.routers.synapse-admin-http.middlewares=redirect-to-https"
+      - "traefik.http.routers.synapse-admin-https.rule=Host(`synadm.lazyworkhorse.net`)"
+      - "traefik.http.routers.synapse-admin-https.entrypoints=websecure"
+      - "traefik.http.routers.synapse-admin-https.tls=true"
+      - "traefik.http.routers.synapse-admin-https.tls.certresolver=njalla"
+      - "traefik.http.services.synapse-admin.loadbalancer.server.port=80"
+
   # rbrowser:
   #   build: 
   #     context: https://github.com/fr33n0w/rBrowser.git#main
@@ -42,5 +102,9 @@ services:
   #     - "traefik.http.services.rns.loadbalancer.server.port=5000"
 
 networks:
-  traefik-net:
+  coms_net:
     external: true
+    name: coms_net
+  coms_backend:
+    driver: bridge
+    name: coms_backend
diff --git a/finance/compose.yml b/finance/compose.yml
index fb2a753..9f4eeab 100644
--- a/finance/compose.yml
+++ b/finance/compose.yml
@@ -4,18 +4,13 @@ services:
   fava:
     image: yegle/fava
     container_name: fava
-
     environment:
       - BEANCOUNT_FILE=/data/beancount_finance_vault/ledger/main/tpouplier.beancount
-
     volumes:
       - /mnt/HoardingCow_docker_data/Fava:/data
-
     networks:
-      - traefik-net
-
-    restart: unless-stopped
-
+      - finance_net
+    restart: always
     labels:
       - "traefik.enable=true"
 
@@ -41,5 +36,5 @@ services:
       - "traefik.http.services.fava.loadbalancer.server.port=5000"
 
 networks:
-  traefik-net:
+  finance_net:
     external: true
diff --git a/homeautomation/compose.yml b/homeautomation/compose.yml
index f4fb123..1bcb5ee 100644
--- a/homeautomation/compose.yml
+++ b/homeautomation/compose.yml
@@ -3,7 +3,7 @@ services:
   homeassistant:
     image: ghcr.io/home-assistant/home-assistant:stable
     container_name: homeassistant
-    restart: unless-stopped
+    restart: always
     privileged: true
     # Was needed for someting.. but dont remember. Deactivated for now.
     # network_mode: host  # Discovery (mDNS/Bluetooth) requires this
@@ -12,7 +12,8 @@ services:
     volumes:
       - /mnt/HoardingCow_docker_data/Home_Assistant:/config:rw
     networks:
-      - traefik-net
+      - home_auto_net
+      - home_auto_backend
     labels:
       - "traefik.enable=true"
 
@@ -33,7 +34,7 @@ services:
     volumes:
       - /mnt/HoardingCow_docker_data/Mosquitto:/mosquitto
     networks:
-      - traefik-net
+      - home_auto_backend
     # ports:
     #   - 1883:1883
     #   - 9001:9001
@@ -42,7 +43,7 @@ services:
     image: registry.gitlab.com/hydroqc/hydroqc2mqtt:1.3.0
     restart: always
     networks:
-      - traefik-net
+      - home_auto_backend
     environment:
       MQTT_USERNAME: hass
       MQTT_PASSWORD: ${MQTT_PASSWORD}
@@ -87,5 +88,8 @@ services:
   #   restart: unless-stopped
 
 networks:
-  traefik-net:
+  home_auto_net:
     external: true
+  home_auto_backend:
+    driver: bridge
+    name: home_auto_backend
diff --git a/homepage/compose.yml b/homepage/compose.yml
index 31ae497..58b07bf 100644
--- a/homepage/compose.yml
+++ b/homepage/compose.yml
@@ -9,9 +9,9 @@ services:
       - PORT=8080
     volumes:
       - /mnt/HoardingCow_docker_data/Homer/assets:/www/assets:rw
-    restart: unless-stopped
+    restart: always
     networks:
-      - traefik-net
+      - homepage_net
     labels:
       - "traefik.enable=true"
 
@@ -37,5 +37,5 @@ services:
       - "traefik.http.services.homer.loadbalancer.server.port=8080"
 
 networks:
-  traefik-net:
+  homepage_net:
     external: true
diff --git a/network/compose.yml b/network/compose.yml
index 7757d98..7642118 100644
--- a/network/compose.yml
+++ b/network/compose.yml
@@ -7,6 +7,7 @@ services:
     command:
       - "--entrypoints.web.address=:80"
       - "--entrypoints.websecure.address=:443"
+      - "--entrypoints.sshnode.address=:2425"
 
       - "--certificatesresolvers.njalla.acme.email=thierrypouplier@gmail.com"
       - "--certificatesresolvers.njalla.acme.storage=/letsencrypt/acme.json"
@@ -25,13 +26,24 @@ services:
       - /mnt/HoardingCow_docker_data/Traefik:/letsencrypt
     restart: unless-stopped
     networks:
-      - traefik-net
+      - traefik_backend
+      - ai_net
+      - auth_net
+      - backup_net
+      - cloud_net
+      - coms_net
+      - finance_net
+      - home_auto_net
+      - homepage_net
+      - passman_net
+      - tak_net
+      - vc_net
 
   ddns-updater:
     image: qmcgaw/ddns-updater
     container_name: ddns-updater
     networks:
-      - traefik-net
+      - traefik_backend
     ports:
       - 8000:8000/tcp
     volumes:
@@ -63,9 +75,42 @@ services:
     restart: unless-stopped
 
 networks:
-  traefik-net:
+  traefik_backend:
     driver: bridge
-    name: traefik-net
+    name: traefik_backend
+  ai_net:
+    external: true
+    name: ai_net
+  auth_net:
+    external: true
+    name: auth_net
+  backup_net:
+    external: true
+    name: backup_net
+  cloud_net:
+    external: true
+    name: cloud_net
+  coms_net:
+    external: true
+    name: coms_net
+  finance_net:
+    external: true
+    name: finance_net
+  home_auto_net:
+    external: true
+    name: home_auto_net
+  homepage_net:
+    external: true
+    name: homepage_net
+  passman_net:
+    external: true
+    name: passman_net
+  tak_net:
+    external: true
+    name: tak_net
+  vc_net:
+    external: true
+    name: vc_net
 
   # duckdns:
   #   environment:
diff --git a/passwordmanager/compose.yml b/passwordmanager/compose.yml
index f458cb1..a02f33c 100644
--- a/passwordmanager/compose.yml
+++ b/passwordmanager/compose.yml
@@ -13,8 +13,8 @@ services:
     volumes:
       - /mnt/HoardingCow_docker_data/BitWarden/data:/data:rw
     networks:
-      - traefik-net
-    restart: unless-stopped
+      - passman_net
+    restart: always
     labels:
       - "traefik.enable=true"
 
@@ -32,5 +32,5 @@ services:
       # Internal service
       - "traefik.http.services.pass.loadbalancer.server.port=80"
 networks:
-  traefik-net:
+  passman_net:
     external: true
diff --git a/tak/compose.yml b/tak/compose.yml
index 71370b3..708bd37 100644
--- a/tak/compose.yml
+++ b/tak/compose.yml
@@ -3,9 +3,9 @@ services:
     image: ghcr.io/freetakteam/freetakserver:master
     container_name: freetakserver
     hostname: freetakserver
-    restart: unless-stopped
+    restart: always
     networks:
-      - traefik-net
+      - tak_backend
     volumes:
       - /mnt/HoardingCow_docker_data/TAK/fts_data:/opt/fts:z,rw
     ports:
@@ -50,9 +50,9 @@ services:
     image: ghcr.io/freetakteam/ui:latest
     container_name: freetakserver-ui
     hostname: freetakserver-ui
-    restart: unless-stopped
+    restart: always
     networks:
-      - traefik-net
+      - tak_net
     ports:
       - 5000:5000
     volumes:
@@ -91,5 +91,8 @@ services:
       - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
 
 networks:
-  traefik-net:
+  tak_net:
     external: true
+  tak_backend:
+    driver: bridge
+    name: tak_backend
diff --git a/versioncontrol/compose.yml b/versioncontrol/compose.yml
index 1c6fc96..7e7b54e 100644
--- a/versioncontrol/compose.yml
+++ b/versioncontrol/compose.yml
@@ -12,8 +12,8 @@ services:
     volumes:
       - /mnt/HoardingCow_docker_data/Gitea:/data
     networks:
-      - traefik-net
-    restart: unless-stopped
+      - vc_net
+    restart: always
     ports:
       - "2222:2222"
     labels:
@@ -41,5 +41,5 @@ services:
       - "traefik.http.services.gitea.loadbalancer.server.port=3000"
 
 networks:
-  traefik-net:
+  vc_net:
     external: true