diff --git a/compose.yml b/compose.yml
index 625f41b4..6b4ac1bd 100755
--- a/compose.yml
+++ b/compose.yml
@@ -61,9 +61,9 @@ services:
     group_add:
       - "${CADDY_GID:-10000}"  # caddy's GID — lets the web user read /logs/access.log
     volumes:
-      - ./caddy-manager-data:/app/data
-      - ./geoip-data:/usr/share/GeoIP:ro,z
-      - ./caddy-logs:/logs:ro
+      - caddy-manager-data:/app/data
+      - geoip-data:/usr/share/GeoIP:ro,z
+      - caddy-logs:/logs:ro
     depends_on:
       caddy:
         condition: service_healthy
@@ -103,12 +103,12 @@ services:
       # - "9090:9090"  # Metrics available at http://localhost:9090/metrics (configure in Settings first)
     environment:
       # Primary domain for Caddy configuration
-      PRIMARY_DOMAIN: akanealw.com
+      PRIMARY_DOMAIN: ${PRIMARY_DOMAIN:-akanealw.com}
     volumes:
-      - ./caddy-data:/data
-      - ./caddy-config:/config
-      - ./caddy-logs:/logs
-      - ./geoip-data:/usr/share/GeoIP:ro,z
+      - caddy-data:/data
+      - caddy-config:/config
+      - caddy-logs:/logs
+      - geoip-data:/usr/share/GeoIP:ro,z
     networks:
       - caddy-network
     healthcheck:
@@ -157,7 +157,7 @@ services:
       POLL_INTERVAL: "${L4_PORT_MANAGER_POLL_INTERVAL:-2}"
       DOCKER_HOST: tcp://docker-socket-proxy:2375
     volumes:
-      - ./caddy-manager-data:/data
+      - caddy-manager-data:/data
       - .:/compose:ro
     depends_on:
       caddy:
@@ -177,7 +177,7 @@ services:
       CLICKHOUSE_PASSWORD: ${CLICKHOUSE_PASSWORD:?ERROR - CLICKHOUSE_PASSWORD is required}
       CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
     volumes:
-      - ./clickhouse-data:/var/lib/clickhouse
+      - clickhouse-data:/var/lib/clickhouse
     networks:
       - caddy-network
     healthcheck:
@@ -202,7 +202,7 @@ services:
       - 'GEOIPUPDATE_EDITION_IDS=GeoLite2-ASN GeoLite2-City GeoLite2-Country'
       - GEOIPUPDATE_FREQUENCY=72
     volumes:
-      - ./geoip-data:/usr/share/GeoIP:z
+      - geoip-data:/usr/share/GeoIP:z
     networks:
       - caddy-network
 
@@ -210,3 +210,10 @@ networks:
   caddy-network:
     driver: bridge
 
+volumes:
+  caddy-manager-data:
+  caddy-data:
+  caddy-config:
+  caddy-logs:
+  geoip-data:
+  clickhouse-data: