diff --git a/media/docker-compose.yml b/media/docker-compose.yml
index 5895549..426226a 100644
--- a/media/docker-compose.yml
+++ b/media/docker-compose.yml
@@ -33,11 +33,12 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
+      - UMASK=022
       - TZ=America/New_York
     volumes:
       - sabnzbd_data:/config
-      - /docker/sabnzbd/downloads:/downloads
-      - /docker/sabnzbd/incomplete-downloads:/incomplete-downloads
+      - /data/usenet/downloads:/downloads
+      - /data/usenet/incomplete-downloads:/incomplete-downloads
     # network_mode: "service:gluetun" forces sabnzbd to connect to the internet through the VPN defined in the gluetun container above
     network_mode: "service:gluetun"
     restart: always
@@ -47,11 +48,12 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
+      - UMASK=022
       - TZ=America/New_York
     volumes:
-      - /docker/sonarr/config:/config
-      - /mnt/share/media:/data
-      - /docker/download_complete:/downloads
+      - /docker/config/sonarr:/config
+      - /mnt/share/media/tv:/data
+      - /data/usenet/downloads:/downloads
     ports:
       - 8989:8989
     restart: always
@@ -61,11 +63,12 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
+      - UMASK=022
       - TZ=America/New_York
     volumes:
-      - radarr_data:/config
+      - /docker/config/radarr:/config
       - /mnt/share/media:/data
-      - /docker/sabnzbd/downloads:/downloads
+      - /data/usenet/downloads:/downloads
     ports:
       - 7878:7878
     restart: always
@@ -75,11 +78,12 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
+      - UMASK=022
       - TZ=America/New_York
     volumes:
-      - lidarr_data:/config
-      - /mnt/share/media:/data
-      - /docker/sabnzbd/downloads:/downloads
+      - /docker/config/lidarr:/config
+      - /mnt/share/media/music:/data
+      - /data/usenet/downloads:/downloads
     ports:
       - 8686:8686
     restart: always
@@ -91,7 +95,7 @@ services:
       - PGID=1000
       - TZ=America/New_York
     volumes:
-      - prowlarr_data:/config
+      - /docker/config/prowlarr:/config
     ports:
       - 9696:9696
     restart: unless-stopped
@@ -99,7 +103,3 @@ services:
 volumes:
   gluetun_data:
   sabnzbd_data:
-  sonarr_data:
-  radarr_data:
-  lidarr_data:
-  prowlarr_data: