diff --git a/firefoxsync/docker-compose.yaml b/firefoxsync/docker-compose.yaml
index dc5aba5..83e6f07 100644
--- a/firefoxsync/docker-compose.yaml
+++ b/firefoxsync/docker-compose.yaml
@@ -3,7 +3,7 @@ services:
   syncserver:
     image: mozilla/syncserver:latest
     volumes:
-      - ${VOLUMES_PATH}/firefoxsync_syncserver:/data
+      - ${VOLUMES_PATH}/firefoxsync/syncserver:/data
     user: ${UID}:${GID}
     networks:
       - web
@@ -23,7 +23,7 @@ services:
       - SYNCSERVER_SQLURI=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db/${POSTGRES_DB}
       - SYNCSERVER_BATCH_UPLOAD_ENABLED=true
       - SYNCSERVER_FORCE_WSGI_ENVIRON=true
-      - SYNCSERVER_DEBUG_ENABLED=true
+      - SYNCSERVER_DEBUG_ENABLED=false
       - SYNCSERVER_ALLOW_NEW_USER=true
       - PORT=5000
 
@@ -38,7 +38,7 @@ services:
     networks:
       - firefoxsync
     volumes:
-      - ${VOLUMES_PATH}/firefoxsync_db:/var/lib/postgresql/data
+      - ${VOLUMES_PATH}/firefoxsync/db:/var/lib/postgresql/data
     user: ${UID}:${GID}
     labels:
       - "docker.group=firefoxsync"
diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml
index 4e428a3..0ec41ff 100644
--- a/monitoring/docker-compose.yaml
+++ b/monitoring/docker-compose.yaml
@@ -39,7 +39,7 @@ services:
   grafanadb:
     image: postgres:${POSTGRES_VERSION}
     volumes:
-      - ${VOLUMES_PATH}/grafanadb:/var/lib/postgresql/data
+      - ${VOLUMES_PATH}/monitoring/grafanadb:/var/lib/postgresql/data
     networks:
       - grafana
     restart: unless-stopped
@@ -61,7 +61,7 @@ services:
     environment:
       - INFLUXDB_MONITOR_STORE_ENABLED=false
     volumes:
-      - ${VOLUMES_PATH}/influxdb/:/var/lib/influxdb
+      - ${VOLUMES_PATH}/monitoring/influxdb/:/var/lib/influxdb
       - ${PWD}/influxdb.conf:/etc/influxdb/influxdb.conf:ro
     labels:
       - "traefik.enable=true"
@@ -84,7 +84,7 @@ services:
       - web # also used to get traefik metrics
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
-      - ${VOLUMES_PATH}/prometheus:/prometheus
+      - ${VOLUMES_PATH}/monitoring/prometheus:/prometheus
     labels:
       - "docker.group=monitoring"
 
diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml
index 679ea49..cf0daff 100644
--- a/nextcloud/docker-compose.yaml
+++ b/nextcloud/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
     depends_on:
       - app
     volumes:
-      - ${VOLUMES_PATH}/nextcloud_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:
@@ -34,8 +34,8 @@ services:
       args:
         - NC_MAIN_VERSION=${NC_MAIN_VERSION}
     volumes:
-      - ${VOLUMES_PATH}/nextcloud_html:/var/www/html
-      - ${VOLUMES_PATH}/nextcloud_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
@@ -66,8 +66,8 @@ services:
     networks:
       - nextcloud
     volumes:
-      - ${VOLUMES_PATH}/nextcloud_html:/var/www/html
-      - ${VOLUMES_PATH}/nextcloud_data:/var/www/html/data
+      - ${VOLUMES_PATH}/nextcloud/html:/var/www/html
+      - ${VOLUMES_PATH}/nextcloud/data:/var/www/html/data
 # If I mount my crontab into the container crond is not working any more :( 
 # docker log should print 11110001 lines
 # https://github.com/nextcloud/docker/issues/1775
@@ -91,8 +91,8 @@ services:
       - web
       - nextcloud
     volumes:
-      - ${VOLUMES_PATH}/nextcloud_html:/var/www/html:ro
-      - ${VOLUMES_PATH}/nextcloud_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
@@ -113,7 +113,7 @@ services:
     image: mariadb:10
     command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --skip-innodb-read-only-compressed
     volumes:
-      - ${VOLUMES_PATH}/nextcloud_db:/var/lib/mysql
+      - ${VOLUMES_PATH}/nextcloud/db:/var/lib/mysql
     restart: unless-stopped
     environment:
       - PUID=1000
@@ -165,7 +165,7 @@ services:
       - nextcloud
       - monitoring
     volumes:
-      - ${VOLUMES_PATH}/nextcloud_redis:/data
+      - ${VOLUMES_PATH}/nextcloud/redis:/data
     labels: 
       - "docker.group=netxtcloud"
 
@@ -205,7 +205,7 @@ services:
     networks:
       - nextcloud
     volumes:
-      - ${VOLUMES_PATH}/nextcloud_fonts:/usr/share/fonts/drawio 
+      - ${VOLUMES_PATH}/nextcloud/fonts:/usr/share/fonts/drawio 
     restart: unless-stopped
     labels:
       - "docker.group=netxtcloud"
diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml
index d71e93a..b0ea9d2 100755
--- a/proxy/docker-compose.yaml
+++ b/proxy/docker-compose.yaml
@@ -40,7 +40,7 @@ services:
       - web
       - dockersocket
     volumes:
-      - ${VOLUMES_PATH}/letsencrypt:/letsencrypt
+      - ${VOLUMES_PATH}/proxy/letsencrypt:/letsencrypt
       - $PWD/tls.toml:/etc/traefik/tls.toml
     labels:
       - "traefik.enable=true"
diff --git a/wallabag/docker-compose.yaml b/wallabag/docker-compose.yaml
index fa68e6e..693087d 100644
--- a/wallabag/docker-compose.yaml
+++ b/wallabag/docker-compose.yaml
@@ -20,7 +20,7 @@ services:
       - web
       - wallabag
     volumes:
-      - /var/dockervolumes/wallabag_images:/var/www/wallabag/web/assets/images
+      - /var/dockervolumes/wallabag/images:/var/www/wallabag/web/assets/images
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.wallabag.rule=Host(`wallabag.${DOMAIN}`)"
@@ -40,7 +40,7 @@ services:
     networks:
       - wallabag
     volumes:
-      - /var/dockervolumes/wallabag_db:/var/lib/mysql
+      - /var/dockervolumes/wallabag/db:/var/lib/mysql
     labels:
       - "docker.group=wallabag"