diff --git a/docker-compose.yml b/docker-compose.yml
index 7dea08c..65e4d05 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -103,7 +103,7 @@ services:
     restart: always
     volumes:
       - ./appdata/jackett/config:/config
-      - ${MEDIA_DIR}/downloads:/downloads
+      - ${MEDIA_DIR}/downloads/torrents:/torrents
 
   jdownloader:
     container_name: jdownloader
@@ -123,7 +123,7 @@ services:
     restart: always
     volumes:
       - ./appdata/jdownloader/config:/config
-      - ${MEDIA_DIR}/downloads:/downloads
+      - ${MEDIA_DIR}/downloads/jdownloader:/downloads
       - /etc/localtime:/etc/localtime:ro
 
   jellyfin:
@@ -153,8 +153,8 @@ services:
     restart: always
     volumes:
       - ./appdata/lidarr/config:/config
-      - ${MEDIA_DIR}:/media
-      - ${MEDIA_DIR}/downloads:/downloads
+      - ${MEDIA_DIR}/Music:/music
+      - ${MEDIA_DIR}/downloads/music:/downloads
 
   metube:
     container_name: metube
@@ -167,7 +167,7 @@ services:
       - 8082:8081
     restart: always
     volumes:
-      - ${MEDIA_DIR}/downloads:/downloads
+      - ${MEDIA_DIR}/downloads/youtubedl:/downloads
       - ./appdata/metube:/config
 
   monitorr:
@@ -198,7 +198,7 @@ services:
     restart: always
     volumes:
       - ./appdata/mstream:/config
-      - ${MEDIA_DIR}:/media
+      - ${MEDIA_DIR}/Music:/music
 
   nginxproxymanager:
     container_name: nginxproxymanager
@@ -310,7 +310,7 @@ services:
     restart: always
     volumes:
       - ./appdata/qbittorrent/config:/config
-      - ${MEDIA_DIR}:/media
+      - ${MEDIA_DIR}/downloads:/downloads
       - ${MEDIA_DIR}/downloads/torrents:/torrents
 
   radarr:
@@ -325,7 +325,7 @@ services:
     restart: always
     volumes:
       - ./appdata/radarr:/config
-      - ${MEDIA_DIR}:/media
+      - ${MEDIA_DIR}:/data
 
   sabnzbd:
     container_name: sabnzbd
@@ -338,7 +338,7 @@ services:
     restart: always
     volumes:
       - ./appdata/sabnzbd:/config
-      - ${MEDIA_DIR}:/media
+      - ${MEDIA_DIR}/downloads:/downloads
       - ${MEDIA_DIR}/downloads/nzbs:/nzbs    
 
   sonarr:
@@ -353,5 +353,5 @@ services:
     restart: always
     volumes:
       - ./appdata/sonarr/config:/config
-      - ${MEDIA_DIR}:/media
+      - ${MEDIA_DIR}:/data