diff --git a/docker-compose.yml b/docker-compose.yml
index bccddb2..853244c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,8 @@ services:
         volumes:
             - ./wireguard-config:/config
             - /lib/modules:/lib/modules
+            - /sys:/sys:rw
+        privileged: true
         ports:
             - 51821:51820/udp # Wireguard
             - 7878:7878 # Radarr
@@ -23,6 +25,7 @@ services:
             - 9117:9117 # Jacket
             - 8112:8112 # Deluge
             - 8191:8191 # FlareSolverr
+            - 5800:5800 # Handbrake
         sysctls:
             - net.ipv4.conf.all.src_valid_mark=1
             - net.ipv6.conf.all.disable_ipv6=0
@@ -38,7 +41,7 @@ services:
             - TZ=Europe/Copenhagen
         volumes:
             - ./radarr/config:/config
-            - ${FILE_PATH}/transcode/input:/movies
+            - ${FILE_PATH}/transcode/input_movies:/movies
             - ${FILE_PATH}/torrent-stack/downloads:/downloads
             - ${FILE_PATH}/torrent-stack/radarr/sma:/usr/local/sma/config
         restart: unless-stopped
@@ -56,8 +59,7 @@ services:
             - TZ=Europe/Copenhagen
         volumes:
             - ./sonarr/config:/config
-            - ${FILE_PATH}/transcode/input_tv:/tv
-            - ${FILE_PATH}/jellyfin/tvshows:/tv
+            - ${FILE_PATH}/transcode/input_tvshows:/tv
             - ${FILE_PATH}/torrent-stack/downloads:/downloads
             - ${FILE_PATH}/torrent-stack/sonarr/sma:/usr/local/sma/config
         restart: unless-stopped
@@ -114,12 +116,16 @@ services:
     handbrake:
         image: jlesage/handbrake
         container_name: handbrake
-        ports:
-            - 5800:5800
         volumes:
             - ./handbrake/config:/config:rw
             - ./handbrake/storage:/storage:ro
-            - ${FILE_PATH}/transcode/input:/watch:rw
-            - ${FILE_PATH}/jellyfin/movies:/output:rw
+            - ${FILE_PATH}/transcode/input_movies:/watch:rw
+            - ${FILE_PATH}/transcode/input_tvshows:/watch2:rw
+            - ${FILE_PATH}/jellyfin/movies:/output_movies:rw
+            - ${FILE_PATH}/jellyfin/tvshows:/output_tvshows:rw
         environment:
             - AUTOMATED_CONVERSION_PRESET=General/Halia default 1080p
+            - AUTOMATED_CONVERSION_OUTPUT_DIR=/output_movies
+            - AUTOMATED_CONVERSION_OUTPUT_DIR_2=/output_tvshows
+        depends_on:
+            - wireguard_torr