diff --git a/docker-compose.yml b/docker-compose.yml
index 3de8eb4..84e10f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,8 +6,7 @@ services:
       - 1883:1883
     volumes:
       - ${REPO_DIR}/home-server/mosquitto/config:/mosquitto/config:rw
-      - ${STORAGE_DIR}/mosquitto/data:/mosquitto/data:rw
-      - ${STORAGE_DIR}/mosquitto/log:/mosquitto/log:rw
+      - mosquitto-data:/mosquitto
   traefik:
     restart: unless-stopped
     image: traefik:v3.6.24
@@ -16,7 +15,7 @@ services:
       - traefik.http.services.dashboard.loadbalancer.server.port=8080
     volumes:
       - ${REPO_DIR}/configurations/traefik/traefik.yml:/etc/traefik/traefik.yml:ro
-      - ${STORAGE_DIR}/traefik/certificates:/var/lib/certificates
+      - traefik-data:/var/lib/certificates
       - /var/run/docker.sock:/var/run/docker.sock
     ports:
       - 80:80
@@ -37,7 +36,7 @@ services:
       - traefik.http.routers.homeassistant.rule=Host(`homeassistant.pladijs`)
       - traefik.http.services.homeassistant.loadbalancer.server.port=8123
     volumes:
-      - ${STORAGE_DIR}/homeassistant:/config
+      - homeassistant-data:/config
     restart: unless-stopped
     env_file:
       - environment-variables/local.env
@@ -52,7 +51,7 @@ services:
       - PGID=1000
       - TZ=Europe/London
     volumes:
-      - ${STORAGE_DIR}/syncthing:/var/syncthing
+      - syncthing-data:/var/syncthing
   node-exporter:
     image: prom/node-exporter:latest
     container_name: node-exporter
@@ -89,7 +88,7 @@ services:
     restart: unless-stopped
     image: grafana/grafana:latest
     volumes:
-      - ${STORAGE_DIR}/grafana:/var/lib/grafana
+      - grafana-data:/var/lib/grafana
     env_file:
       - environment-variables/local.env
       - environment-variables/production.env
@@ -111,7 +110,7 @@ services:
       - environment-variables/production.env
     volumes:
       - ${STORAGE_DIR}/influxdb/data:/var/lib/influxdb2
-      - ${STORAGE_DIR}/influxdb/config/:/etc/influxdb2
+      - influxdb-data:/etc/influxdb2
     ulimits:
       nofile:
         soft: 32768
@@ -127,3 +126,10 @@ services:
 #       - 4317:4317 # OTLP gRPC receiver
 volumes:
   prometheus-data:
+  influxdb-data:
+  grafana-data:
+  homeassistant-data:
+  mosquitto-data:
+  traefik-data:
+
+