diff --git a/downloader.yml b/downloader.yml
index 5fc04ec..f9024bb 100644
--- a/downloader.yml
+++ b/downloader.yml
@@ -25,8 +25,7 @@ services:
       - TZ=${TZ}
     volumes:
       - ${SSD}/sonarr/data:/config
-      - ${MEDIA_HDD}/media/tvseries:/media/tv 
-      - ${MEDIA_SMB}/tvseries:/media/smb/tv
+      - tvseries_smb_share:/media/smb/tv
       - ${TORRENT_HDD}/downloads:/downloads 
     ports:
       - 8989:8989
@@ -40,9 +39,23 @@ services:
       - TZ=${TZ}
     volumes:
       - ${SSD}/radarr/data:/config
-      - ${MEDIA_HDD}/media/movies:/movies 
-      - ${MEDIA_SMB}/movies:/media/smb/movies
+      - movies_smb_share:/media/smb/movies
       - ${TORRENT_HDD}/downloads:/downloads 
     ports:
       - 7878:7878
-    restart: unless-stopped
\ No newline at end of file
+    restart: unless-stopped
+
+volumes:
+  movies_smb_share:
+    driver: local
+    driver_opts:
+      type: cifs
+      device: "//192.168.1.15/media/tvseries"
+      o: "username=$(SMB_USER),password=$(SMB_PASS),file_mode=0777,dir_mode=0777,vers=3.0"
+  
+  tvseries_smb_share:
+    driver: local
+    driver_opts:
+      type: cifs
+      device: "//192.168.1.15/media/movies"
+      o: "username=$(SMB_USER),password=$(SMB_PASS),file_mode=0777,dir_mode=0777,vers=3.0"
\ No newline at end of file
diff --git a/media.yml b/media.yml
index 558dbf0..93d05fd 100644
--- a/media.yml
+++ b/media.yml
@@ -10,20 +10,6 @@ services:
       - SECRET_ENCRYPTION_KEY=a5768cf048956f4da12fd0773b95f8960d571cfd2889c5c428ca9a4c8016bb36
     ports:
       - '7575:7575'
-  # emby:
-  #   image: emby/embyserver
-  #   container_name: emby
-  #   environment:
-  #     - UID=1000 # The UID to run emby as (default: 2)
-  #     - GID=100 # The GID to run emby as (default 2)
-  #     - GIDLIST=100 # A comma-separated list of additional GIDs to run emby as (default: 2)
-  #   volumes:
-  #     - ${SSD}/emby/programdata:/config # Configuration directory
-  #     - ${MEDIA_HDD}/media:/media # Media directory
-  #   ports:
-  #     - 8096:8096 # HTTP port
-  #     - 8920:8920 # HTTPS port
-  #   restart: unless-stopped
   jackett:
     image: lscr.io/linuxserver/jackett:latest
     container_name: jackett