diff --git a/services/authentication/docker-compose.yml b/services/authentication/docker-compose.yml
index 343ee37..d5857ed 100644
--- a/services/authentication/docker-compose.yml
+++ b/services/authentication/docker-compose.yml
@@ -20,7 +20,7 @@ services:
     networks:
       - reverse-proxy
     volumes:
-      - config:/config
+      - authelia_config:/config/
     configs:
       - source: authelia_configuration
         target: /etc/authelia/configuration.yml
@@ -41,7 +41,7 @@ networks:
     external: true
 
 volumes:
-  config:
+  authelia_config:
     driver_opts:
       type: none
       o: bind
diff --git a/services/book-collector/docker-compose.yml b/services/book-collector/docker-compose.yml
index 57128ed..a10cf19 100644
--- a/services/book-collector/docker-compose.yml
+++ b/services/book-collector/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - usenet
     volumes:
       - lazylibrarian_config:/config/
-      - data:/data
+      - data:/data/
     restart: unless-stopped
     labels:
       traefik.enable: true
@@ -33,7 +33,7 @@ services:
       - usenet
     volumes:
       - readarr_config:/config/
-      - data:/data
+      - data:/data/
     restart: unless-stopped
     labels:
       traefik.enable: true
diff --git a/services/comic-collector/docker-compose.yml b/services/comic-collector/docker-compose.yml
index cc44647..c97440f 100644
--- a/services/comic-collector/docker-compose.yml
+++ b/services/comic-collector/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - usenet
     volumes:
       - mylar_config:/config/
-      - data:/data
+      - data:/data/
     restart: unless-stopped
     labels:
       traefik.enable: true
diff --git a/services/movie-collector/docker-compose.yml b/services/movie-collector/docker-compose.yml
index e24f199..ae1f583 100644
--- a/services/movie-collector/docker-compose.yml
+++ b/services/movie-collector/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - usenet
     volumes:
       - radarr_config:/config/
-      - data:/data
+      - data:/data/
     restart: unless-stopped
     labels:
       traefik.enable: true
diff --git a/services/network-monitoring/docker-compose.yml b/services/network-monitoring/docker-compose.yml
index fddaf44..2d1d8ca 100644
--- a/services/network-monitoring/docker-compose.yml
+++ b/services/network-monitoring/docker-compose.yml
@@ -10,8 +10,8 @@ services:
     networks:
       - reverse-proxy
     volumes:
-      - smokeping_data:/data/
       - smokeping_config:/config/
+      - smokeping_data:/data/
     restart: unless-stopped
     labels:
       traefik.enable: true
diff --git a/services/subtitle-collector/docker-compose.yml b/services/subtitle-collector/docker-compose.yml
index d56bbe9..05bfab0 100644
--- a/services/subtitle-collector/docker-compose.yml
+++ b/services/subtitle-collector/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - tv-collector
     volumes:
       - bazarr_config:/config/
-      - data:/data
+      - data:/data/media/ # TODO: Just mount TV/Movies?
     restart: unless-stopped
     labels:
       traefik.enable: true
diff --git a/services/tv-collector/docker-compose.yml b/services/tv-collector/docker-compose.yml
index 3156406..6662374 100644
--- a/services/tv-collector/docker-compose.yml
+++ b/services/tv-collector/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - usenet
     volumes:
       - sonarr_config:/config/
-      - data:/data
+      - data:/data/
     restart: unless-stopped
     labels:
       traefik.enable: true
diff --git a/services/usenet/docker-compose.yml b/services/usenet/docker-compose.yml
index 884d2ed..6067b40 100644
--- a/services/usenet/docker-compose.yml
+++ b/services/usenet/docker-compose.yml
@@ -18,8 +18,8 @@ services:
       - reverse-proxy
       - usenet
     volumes:
-      - sabnzbd_config:/config
-      - usenet:/downloads
+      - sabnzbd_config:/config/
+      - usenet:/data/
     restart: unless-stopped
     labels:
       traefik.enable: true