diff --git a/.env b/.env
index b0b1c1b..25d30c8 100644
--- a/.env
+++ b/.env
@@ -13,7 +13,8 @@ TZ=America/Chicago
 ADMIN_USERNAME=akanealw
 ADMIN_PASSWORD=8ung1e1!
 DATA_DIR=/mnt/data
-MEDIA_DIR=/mnt/data/media
+MEDIA_DIR=/mnt/truenasmedia
+STORAGE_DIR=/mnt/storage
 
 # COLLABORA CODE
 NEXTCLOUD_DOMAIN=owncloud.akanealw.com
diff --git a/docker-compose.yml b/docker-compose.yml
index 86af083..13767c4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -134,7 +134,7 @@ services:
       - 5002:5000
     restart: unless-stopped
     volumes:
-      - ${DATA_DIR}/storage/ComicsAndManga:/comicsandmanga
+      - ${STORAGE_DIR}/ComicsAndManga:/comicsandmanga
       - ${DOCKERCONFIGS}/kavita/config:/kavita/config
 
   lidarr:
@@ -149,7 +149,7 @@ services:
     restart: unless-stopped
     volumes:
       - ${DOCKERCONFIGS}/lidarr/config:/config
-      - ${DATA_DIR}/storage/Music/Albums:/music
+      - ${STORAGE_DIR}//Music/Albums:/music
       - ${MEDIA_DIR}/downloads/music:/downloads
 
   meshcentral:
@@ -211,7 +211,7 @@ services:
     restart: unless-stopped
     volumes:
       - ${DOCKERCONFIGS}/mstream:/config
-      - ${DATA_DIR}/storage/Music:/music
+      - ${STORAGE_DIR}/Music:/music
 
   nzbhydra:
     container_name: nzbhydra
@@ -358,7 +358,7 @@ services:
     restart: unless-stopped
     volumes:
       - ${DOCKERCONFIGS}/syncthing/config:/config
-      - ${DATA_DIR}/storage:/storage
+      - ${STORAGE_DIR}:/storage
 
   trilium:
     container_name: trilium