diff --git a/firefoxsync/docker-compose.yaml b/firefoxsync/docker-compose.yaml
index ba34de7..6cd5b0d 100644
--- a/firefoxsync/docker-compose.yaml
+++ b/firefoxsync/docker-compose.yaml
@@ -3,14 +3,14 @@ services:
   syncserver:
     image: mozilla/syncserver:latest
     volumes:
-      - ${STORAGE_PATH}/syncserver:/data
+      - ${VOLUMES_PATH}/firefoxsync/syncserver:/data
     user: ${UID}:${GID}
     networks:
       - web
       - firefoxsync
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.ffs.rule=Host(`${FQDN_FIREFOXSYNC}`)"
+      - "traefik.http.routers.ffs.rule=Host(`firefoxsync.${DOMAIN}`)"
       - "traefik.http.routers.ffs.entrypoints=websecure"
       - "traefik.http.routers.ffs.tls.certresolver=netcup"
       - "traefik.http.routers.ffs.tls.options=intermediate@file"
@@ -18,7 +18,7 @@ services:
       - "docker.group=firefoxsync"
     restart: unless-stopped
     environment:
-      - SYNCSERVER_PUBLIC_URL=https://${FQDN_FIREFOXSYNC}
+      - SYNCSERVER_PUBLIC_URL=https://firefoxsync.${DOMAIN}
       - SYNCSERVER_SECRET=&{SECRET}
       - SYNCSERVER_SQLURI=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db/${POSTGRES_DB}
       - SYNCSERVER_BATCH_UPLOAD_ENABLED=true
@@ -38,7 +38,7 @@ services:
     networks:
       - firefoxsync
     volumes:
-      - ${STORAGE_PATH}/db:/var/lib/postgresql/data
+      - ${VOLUMES_PATH}/firefoxsync/db:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
       interval: 10s
diff --git a/git/docker-compose.yaml b/git/docker-compose.yaml
index 223451c..bc8589c 100644
--- a/git/docker-compose.yaml
+++ b/git/docker-compose.yaml
@@ -3,7 +3,7 @@ services:
   forgejo:
     image: codeberg.org/forgejo/forgejo:${FORGEJO_VERSION}
     volumes:
-      - ${STORAGE_PATH}/forgejo_data:/data
+      - ${VOLUMES_PATH}/git/forgejo_data:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
@@ -29,13 +29,13 @@ services:
       timeout: 3s
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.forgejo.rule=Host(`${FQDN_GIT}`, `${FQDN_GIT_OLD}`)"
+      - "traefik.http.routers.forgejo.rule=Host(`gitea.${DOMAIN}`, `git.${DOMAIN}`)"
       - "traefik.http.routers.forgejo.entrypoints=websecure"
       - "traefik.http.routers.forgejo.tls.certresolver=netcup"
       - "traefik.http.routers.forgejo.tls.options=intermediate@file"
       - "traefik.http.routers.forgejo.middlewares=gitearedir"
-      - "traefik.http.middlewares.gitearedir.redirectregex.regex=^https://${FQDN_GIT_OLD}/(.*)"
-      - "traefik.http.middlewares.gitearedir.redirectregex.replacement=https://${FQDN_GIT}/$${1}"
+      - "traefik.http.middlewares.gitearedir.redirectregex.regex=^https://gitea.${DOMAIN}/(.*)"
+      - "traefik.http.middlewares.gitearedir.redirectregex.replacement=https://git.${DOMAIN}/$${1}"
       - "traefik.http.middlewares.gitearedir.redirectregex.permanent=true"
       - "traefik.http.services.forgejo.loadbalancer.server.port=3000"
       - "docker.group=git"
@@ -51,7 +51,7 @@ services:
     networks:
       - git
     volumes:
-      - ${STORAGE_PATH}/forgejo_db:/var/lib/postgresql/data
+      - ${VOLUMES_PATH}/git/forgejo_db:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
       interval: 10s
diff --git a/news/docker-compose.yaml b/news/docker-compose.yaml
index f63aa78..c2ae27b 100644
--- a/news/docker-compose.yaml
+++ b/news/docker-compose.yaml
@@ -15,14 +15,14 @@ services:
       - CREATE_ADMIN=1
       - ADMIN_USERNAME=${ADMIN_USER}
       - ADMIN_PASSWORD=${ADMIN_PASSWORD}
-      - BASE_URL=https://${FQDN_NEWS}
+      - BASE_URL=https://news.${DOMAIN}
       - POLLING_FREQUENCY=15 # minutes
       # - LOG_LEVEL=debug
     healthcheck:
       test: ["CMD", "/usr/bin/miniflux", "-healthcheck", "auto"]
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.news.rule=Host(`${FQDN_NEWS}`)"
+      - "traefik.http.routers.news.rule=Host(`news.${DOMAIN}`)"
       - "traefik.http.routers.news.entrypoints=websecure"
       - "traefik.http.routers.news.tls.certresolver=netcup"
       - "traefik.http.routers.news.tls.options=intermediate@file"
@@ -40,7 +40,7 @@ services:
     networks:
       - news
     volumes:
-      - ${STORAGE_PATH}/db:/var/lib/postgresql/data
+      - ${VOLUMES_PATH}/news/db:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD", "pg_isready", "-U", "miniflux"]
       interval: 10s
diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml
index fa852a0..8503667 100644
--- a/nextcloud/docker-compose.yaml
+++ b/nextcloud/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
     depends_on:
       - app
     volumes:
-      - ${STORAGE_PATH}/html:/var/www/html:ro
+      - ${VOLUMES_PATH}/nextcloud/html:/var/www/html:ro
       - $PWD/nginx.conf:/etc/nginx/nginx.conf:ro
     restart: unless-stopped
     networks:
@@ -17,7 +17,7 @@ services:
 #      timeout: 3s
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.nextcloud.rule=Host(`${FQDN_NEXTCLOUD}`)"
+      - "traefik.http.routers.nextcloud.rule=Host(`cloud.${DOMAIN}`)"
       - "traefik.http.routers.nextcloud.entrypoints=websecure"
       - "traefik.http.routers.nextcloud.tls.certresolver=netcup"
       - "traefik.http.routers.nextcloud.tls.options=intermediate@file"
@@ -38,15 +38,15 @@ services:
       args:
         - NC_MAIN_VERSION=${NC_MAIN_VERSION}
     volumes:
-      - ${STORAGE_PATH}/html:/var/www/html
-      - ${STORAGE_PATH}/data:/var/www/html/data
+      - ${VOLUMES_PATH}/nextcloud/html:/var/www/html
+      - ${VOLUMES_PATH}/nextcloud/data:/var/www/html/data
       - type: tmpfs
         target: /tmp
     restart: unless-stopped
     networks:
       - nextcloud
     environment:
-      - NEXTCLOUD_TRUSTED_TLDS=${FQDN_NEXTCLOUD}
+      - NEXTCLOUD_TRUSTED_DOMAINS=${NEXTCLOUD_TRUSTED_DOMAINS}
       - MYSQL_HOST=db
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - MYSQL_DATABASE=${MYSQL_DATABASE}
@@ -70,8 +70,8 @@ services:
     networks:
       - nextcloud
     volumes:
-      - ${STORAGE_PATH}/html:/var/www/html
-      - ${STORAGE_PATH}/data:/var/www/html/data
+      - ${VOLUMES_PATH}/nextcloud/html:/var/www/html
+      - ${VOLUMES_PATH}/nextcloud/data:/var/www/html/data
     entrypoint: /cron.sh
     depends_on:
       - db
@@ -89,15 +89,15 @@ services:
       - web
       - nextcloud
     volumes:
-      - ${STORAGE_PATH}/html:/var/www/html:ro
-      - ${STORAGE_PATH}/data:/var/www/html/data:ro
+      - ${VOLUMES_PATH}/nextcloud/html:/var/www/html:ro
+      - ${VOLUMES_PATH}/nextcloud/data:/var/www/html/data:ro
     environment:
       - PORT=7867
       - NEXTCLOUD_URL=http://web
     entrypoint: /var/www/html/custom_apps/notify_push/bin/x86_64/notify_push /var/www/html/config/config.php
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.ncpush.rule=Host(`${FQDN_NEXTCLOUD}`) && PathPrefix(`/push`)"
+      - "traefik.http.routers.ncpush.rule=Host(`cloud.${DOMAIN}`) && PathPrefix(`/push`)"
       - "traefik.http.routers.ncpush.entrypoints=websecure"
       - "traefik.http.routers.ncpush.tls.certresolver=netcup"
       - "traefik.http.routers.ncpush.tls.options=intermediate@file"
@@ -111,7 +111,7 @@ services:
     image: mariadb:${MARIADB_VERSION}
     command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --skip-innodb-read-only-compressed
     volumes:
-      - ${STORAGE_PATH}/db:/var/lib/mysql
+      - ${VOLUMES_PATH}/nextcloud/db:/var/lib/mysql
     restart: unless-stopped
     environment:
       - PUID=1000
@@ -151,7 +151,7 @@ services:
 #      - db
 #    labels:
 #      - "traefik.enable=true"
-#      - "traefik.http.routers.adminer.rule=Host(`${FQDN_ADMINER}`)"
+#      - "traefik.http.routers.adminer.rule=Host(`adminer.${DOMAIN}`)"
 #      - "traefik.http.routers.adminer.entrypoints=websecure"
 #      - "traefik.http.routers.adminer.tls.certresolver=netcup"
 #      - "traefik.http.routers.adminer.tls.options=intermediate@file"
@@ -167,7 +167,7 @@ services:
     networks:
       - nextcloud
     volumes:
-      - ${STORAGE_PATH}/redis:/data
+      - ${VOLUMES_PATH}/nextcloud/redis:/data
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
       interval: 5s
@@ -189,15 +189,14 @@ services:
     expose:
       - 9980
     environment:
-      - domain=${FQDN_NEXTCLOUD}
-      - aliasgroup1=https://${FQDN_NEXTCLOUD}
+      - domain=cloud.${DOMAIN}
       - username=${COLLABORA_ADMIN_USER}
       - password=${COLLABORA_ADMIN_PASSWORD}
       - "extra_params=--o:ssl.enable=false --o:ssl.termination=true"
     restart: unless-stopped
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.collabora.rule=Host(`${FQDN_OFFICE}`)"
+      - "traefik.http.routers.collabora.rule=Host(`collabora.${DOMAIN}`)"
       - "traefik.http.routers.collabora.entrypoints=websecure"
       - "traefik.http.routers.collabora.tls.certresolver=netcup"
       - "traefik.http.routers.collabora.tls.options=intermediate@file"
@@ -212,7 +211,7 @@ services:
     networks:
       - nextcloud
     volumes:
-      - ${STORAGE_PATH}/fonts:/usr/share/fonts/drawio
+      - ${VOLUMES_PATH}/nextcloud/fonts:/usr/share/fonts/drawio
     restart: unless-stopped
     labels:
       - "docker.group=netxtcloud"
@@ -226,7 +225,7 @@ services:
     depends_on:
       - drawio-export
     environment:
-      - VIRTUAL_HOST=${FQDN_DRAWIO}
+      - VIRTUAL_HOST=drawio.${DOMAIN}
       - VIRTUAL_PORT=8080
       - LETS_ENCRYPT_ENABLED=false
       - EXPORT_URL=http://drawio-export:8000/
@@ -239,7 +238,7 @@ services:
       start_period: 20s
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.drawio.rule=Host(`${FQDN_DRAWIO}`)"
+      - "traefik.http.routers.drawio.rule=Host(`drawio.${DOMAIN}`)"
       - "traefik.http.routers.drawio.entrypoints=websecure"
       - "traefik.http.routers.drawio.tls.certresolver=netcup"
       - "traefik.http.routers.drawio.tls.options=intermediate@file"
diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml
index 4881fd7..e69c689 100755
--- a/proxy/docker-compose.yaml
+++ b/proxy/docker-compose.yaml
@@ -41,7 +41,7 @@ services:
       - web
       - dockersocket
     volumes:
-      - ${STORAGE_PATH}/letsencrypt:/letsencrypt
+      - ${VOLUMES_PATH}/proxy/letsencrypt:/letsencrypt
       - $PWD/tls.toml:/etc/traefik/tls.toml
     healthcheck:
       test: traefik healthcheck --ping
@@ -49,7 +49,7 @@ services:
       timeout: 1s
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.dashboard.rule=Host(`${FQDN_TRAEFIK}`)"
+      - "traefik.http.routers.dashboard.rule=Host(`traefik.${DOMAIN}`)"
       - "traefik.http.routers.dashboard.service=api@internal"
       - "traefik.http.routers.dashboard.entrypoints=websecure"
       - "traefik.http.routers.dashboard.tls.certresolver=netcup"
@@ -88,7 +88,7 @@ services:
 #      - web
 #    labels:
 #      - "traefik.enable=true"
-#      - "traefik.http.routers.whoami.rule=Host(`${FQDN_WHOAMI}`)"
+#      - "traefik.http.routers.whoami.rule=Host(`whoami.${DOMAIN}`)"
 #      - "traefik.http.routers.whoami.entrypoints=websecure"
 #      - "traefik.http.routers.whoami.tls.certresolver=netcup"
 #      - "docker.group=proxy"
diff --git a/push/docker-compose.yaml b/push/docker-compose.yaml
index ef05c1e..0dfad7a 100644
--- a/push/docker-compose.yaml
+++ b/push/docker-compose.yaml
@@ -9,7 +9,7 @@ services:
       - serve
     environment:
       - TZ=UTC
-      - NTFY_BASE_URL=https://${FQDN_PUSH}
+      - NTFY_BASE_URL=https://push.${DOMAIN}
       - NTFY_LISTEN_HTTP=0.0.0.0:80
       - NTFY_CACHE_FILE=/var/cache/ntfy/cache.db
       - NTFY_CACHE_DURATION=24h
@@ -22,11 +22,11 @@ services:
       - NTFY_ENABLE_LOGIN=true
       - NTFY_ENABLE_RESERVATIONS=false
     volumes:
-      - ${STORAGE_PATH}/ntfy/cache/:/var/cache/ntfy
-      - ${STORAGE_PATH}/ntfy/varlib/:/var/lib/ntfy/
+      - ${VOLUMES_PATH}/push/ntfy/cache/:/var/cache/ntfy
+      - ${VOLUMES_PATH}/push/ntfy/varlib/:/var/lib/ntfy/
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.push.rule=Host(`${FQDN_PUSH}`)"
+      - "traefik.http.routers.push.rule=Host(`push.${DOMAIN}`)"
       - "traefik.http.routers.push.entrypoints=websecure"
       - "traefik.http.routers.push.tls.certresolver=netcup"
       - "traefik.http.routers.push.tls.options=intermediate@file"
diff --git a/rustdesk/docker-compose.yml b/rustdesk/docker-compose.yml
index 68a6627..6a01a16 100644
--- a/rustdesk/docker-compose.yml
+++ b/rustdesk/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     image: rustdesk/rustdesk-server:${RUSTDESK_VERSION}
     command: hbbs -r ${DOMAIN}:21117 -k _
     volumes:
-      - ${STORAGE_PATH}:/root
+      - ${VOLUMES_PATH}/rustdesk:/root
     networks:
       - rustdesk
     depends_on:
@@ -26,7 +26,7 @@ services:
     image: rustdesk/rustdesk-server:latest
     command: hbbr -k _
     volumes:
-      - ${STORAGE_PATH}:/root
+      - ${VOLUMES_PATH}/rustdesk:/root
     networks:
       - rustdesk
     restart: unless-stopped
diff --git a/wallabag/docker-compose.yaml b/wallabag/docker-compose.yaml
index d8c9970..0130a05 100644
--- a/wallabag/docker-compose.yaml
+++ b/wallabag/docker-compose.yaml
@@ -15,19 +15,19 @@ services:
       - SYMFONY__ENV__MAILER_USER=~
       - SYMFONY__ENV__MAILER_PASSWORD=~
       - SYMFONY__ENV__FROM_EMAIL=wallabag@${DOMAIN}
-      - SYMFONY__ENV__DOMAIN_NAME=https://${FQDN_WALLABAG}
+      - SYMFONY__ENV__DOMAIN_NAME=https://wallabag.${DOMAIN}
     networks:
       - web
       - wallabag
     volumes:
-      - ${STORAGE_PATH}/images:/var/www/wallabag/web/assets/images
+      - ${VOLUMES_PATH}/wallabag/images:/var/www/wallabag/web/assets/images
     healthcheck:
       test: ["CMD", "curl" ,"--fail", "http://localhost/api/info"]
       interval: 10s
       timeout: 3s
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.wallabag.rule=Host(`${FQDN_WALLABAG}`)"
+      - "traefik.http.routers.wallabag.rule=Host(`wallabag.${DOMAIN}`)"
       - "traefik.http.routers.wallabag.entrypoints=websecure"
       - "traefik.http.routers.wallabag.tls.certresolver=netcup"
       - "traefik.http.routers.wallabag.tls.options=intermediate@file"
@@ -44,7 +44,7 @@ services:
     networks:
       - wallabag
     volumes:
-      - ${STORAGE_PATH}/db:/var/lib/mysql
+      - /var/dockervolumes/wallabag/db:/var/lib/mysql
     labels:
       - "docker.group=wallabag"
 
diff --git a/www/docker-compose.yaml b/www/docker-compose.yaml
index 80e2e63..b56b307 100644
--- a/www/docker-compose.yaml
+++ b/www/docker-compose.yaml
@@ -20,10 +20,10 @@ services:
       - "traefik.http.routers.webroot.tls.options=intermediate@file"
       - "traefik.http.routers.webroot.middlewares=redirect-to-www"
       - "traefik.http.middlewares.redirect-to-www.redirectregex.regex=^https?://${DOMAIN}/(.*)"
-      - "traefik.http.middlewares.redirect-to-www.redirectregex.replacement=https://${FQDN_WWW}/$${1}"
+      - "traefik.http.middlewares.redirect-to-www.redirectregex.replacement=https://www.${DOMAIN}/$${1}"
       - "traefik.http.middlewares.redirect-to-www.redirectregex.permanent=true"
       - "traefik.http.routers.www-secure.entrypoints=websecure"
-      - "traefik.http.routers.www-secure.rule=Host(`${FQDN_WWW}`)"
+      - "traefik.http.routers.www-secure.rule=Host(`www.${DOMAIN}`)"
       - "traefik.http.routers.www-secure.tls.certresolver=netcup"
       - "traefik.http.routers.www-secure.tls.options=intermediate@file"
       - "docker.group=www"