diff --git a/collectors.docker-compose.yml b/collectors.docker-compose.yml
index 76a138d..9ebace4 100644
--- a/collectors.docker-compose.yml
+++ b/collectors.docker-compose.yml
@@ -13,9 +13,7 @@ services:
       - downloads
     volumes:
       - mylar_config:/config/
-      - comics:/comics/
-      - torrents_completed:/downloads/torrents/
-      - usenet_completed:/downloads/usenet/
+      - data:/data
     restart: unless-stopped
     labels:
       traefik.enable: true
@@ -32,9 +30,7 @@ services:
       - downloads
     volumes:
       - lazylibrarian_config:/config/
-      - books:/books/
-      - torrents_completed:/downloads/torrents/
-      - usenet_completed:/downloads/usenet/
+      - data:/data
     restart: unless-stopped
     labels:
       traefik.enable: true
@@ -50,9 +46,7 @@ services:
       - downloads
     volumes:
       - sonarr_config:/config/
-      - tv:/tv/
-      - torrents_completed:/downloads/torrents/
-      - usenet_completed:/downloads/usenet/
+      - data:/data
     restart: unless-stopped
     labels:
       traefik.enable: true
@@ -68,9 +62,7 @@ services:
       - downloads
     volumes:
       - radarr_config:/config/
-      - movies:/movies/
-      - torrents_completed:/downloads/torrents/
-      - usenet_completed:/downloads/usenet/
+      - data:/data
     restart: unless-stopped
     labels:
       traefik.enable: true
@@ -85,8 +77,7 @@ services:
       - gotify
     volumes:
       - bazarr_config:/config/
-      - movies:/movies/
-      - tv:/tv/
+      - data:/data
     restart: unless-stopped
     labels:
       traefik.enable: true
@@ -114,19 +105,11 @@ networks:
     external: true
 
 volumes:
-  books:
-    external: true
-  comics:
-    external: true
-  movies:
-    external: true
-  tv:
-    external: true
-
-  torrents_completed:
-    external: true
-  usenet_completed:
-    external: true
+  data:
+    driver_opts:
+      type: none
+      o: bind
+      device: ${NASCOMPOSE_DATA?}
 
   mylar_config:
     driver_opts:
diff --git a/downloads/.gitignore b/data/.gitignore
similarity index 100%
rename from downloads/.gitignore
rename to data/.gitignore
diff --git a/downloads/torrents/completed/.gitkeep b/data/media/books/.gitkeep
similarity index 100%
rename from downloads/torrents/completed/.gitkeep
rename to data/media/books/.gitkeep
diff --git a/downloads/usenet/completed/.gitkeep b/data/media/comics/.gitkeep
similarity index 100%
rename from downloads/usenet/completed/.gitkeep
rename to data/media/comics/.gitkeep
diff --git a/media/books/.gitkeep b/data/media/movies/.gitkeep
similarity index 100%
rename from media/books/.gitkeep
rename to data/media/movies/.gitkeep
diff --git a/media/comics/.gitkeep b/data/media/recycle_bin/.gitkeep
similarity index 100%
rename from media/comics/.gitkeep
rename to data/media/recycle_bin/.gitkeep
diff --git a/media/movies/.gitkeep b/data/media/tv/.gitkeep
similarity index 100%
rename from media/movies/.gitkeep
rename to data/media/tv/.gitkeep
diff --git a/media/recycle_bin/.gitkeep b/data/torrents/completed/.gitkeep
similarity index 100%
rename from media/recycle_bin/.gitkeep
rename to data/torrents/completed/.gitkeep
diff --git a/media/tv/.gitkeep b/data/usenet/completed/.gitkeep
similarity index 100%
rename from media/tv/.gitkeep
rename to data/usenet/completed/.gitkeep
diff --git a/downloads.docker-compose.yml b/downloads.docker-compose.yml
index fbfb91a..f31d950 100644
--- a/downloads.docker-compose.yml
+++ b/downloads.docker-compose.yml
@@ -1,15 +1,6 @@
 name: Downloads
 
 services:
-  dummy:
-    image: alpine
-    entrypoint: sleep infinity
-    volumes:
-      - torrents:/torrents/
-      - torrents_completed:/torrents/completed
-      - usenet:/usenet/
-      - usenet_completed:/usenet/completed
-
   prowlarr:
     image: linuxserver/prowlarr
     environment:
@@ -99,34 +90,21 @@ networks:
     external: true
 
 volumes:
-  torrents_completed:
-    name: torrents_completed
-    driver_opts:
-      type: none
-      o: bind
-      device: ${NASCOMPOSE_DOWNLOADS?}/torrents/completed/
-  usenet_completed:
-    name: usenet_completed
-    driver_opts:
-      type: none
-      o: bind
-      device: ${NASCOMPOSE_DOWNLOADS?}/usenet/completed/
-
   torrents:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_DOWNLOADS?}/torrents/
+      device: ${NASCOMPOSE_DATA?}/torrents/
   usenet:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_DOWNLOADS?}/usenet/
+      device: ${NASCOMPOSE_DATA?}/usenet/
   youtube:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_DOWNLOADS?}/youtube/
+      device: ${NASCOMPOSE_DATA?}/youtube/
 
   prowlarr_config:
     driver_opts:
diff --git a/media.docker-compose.yml b/media.docker-compose.yml
index b9bcd28..f719afb 100644
--- a/media.docker-compose.yml
+++ b/media.docker-compose.yml
@@ -63,32 +63,32 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_MEDIA?}/books/
+      device: ${NASCOMPOSE_DATA?}/media/books/
   comics:
     name: comics
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_MEDIA?}/comics/
+      device: ${NASCOMPOSE_DATA?}/media/comics/
   movies:
     name: movies
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_MEDIA?}/movies/
+      device: ${NASCOMPOSE_DATA?}/media/movies/
   tv:
     name: tv
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_MEDIA?}/tv/
+      device: ${NASCOMPOSE_DATA?}/media/tv/
   # TODO: Manage recycle bin properly...
   recycle_bin:
     name: recycle_bin
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_MEDIA?}/recycle_bin/
+      device: ${NASCOMPOSE_DATA?}/media/recycle_bin/
 
   plex_config:
     driver_opts:
diff --git a/nas-compose.env b/nas-compose.env
index 6c69165..0149d06 100644
--- a/nas-compose.env
+++ b/nas-compose.env
@@ -4,8 +4,7 @@ NASCOMPOSE_UID=1000
 NASCOMPOSE_GID=1000
 
 NASCOMPOSE_SERVICES=
-NASCOMPOSE_DOWNLOADS=
-NASCOMPOSE_MEDIA=
+NASCOMPOSE_DATA=
 
 NASCOMPOSE_MACVLAN_IFACE=
 NASCOMPOSE_MACVLAN_SUBNET=