diff --git a/applications/roles/base/tasks/containers.yml b/applications/roles/base/tasks/containers.yml
index d8b54ab..c1425d3 100644
--- a/applications/roles/base/tasks/containers.yml
+++ b/applications/roles/base/tasks/containers.yml
@@ -30,5 +30,8 @@
     image: containrrr/watchtower
     restart_policy: always
     command: --schedule "0 0 4 * * *"
+    env:
+      - "TZ={{ TZ }}"
+      - WATCHTOWER_CLEANUP=true
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/applications/roles/media-manager/tasks/main.yml b/applications/roles/media-manager/tasks/main.yml
index 2a1e325..b13f337 100644
--- a/applications/roles/media-manager/tasks/main.yml
+++ b/applications/roles/media-manager/tasks/main.yml
@@ -108,23 +108,6 @@
     ports:
       - 7878:7878
 
-- name: Deploy Radarr
-  community.docker.docker_container:
-    name: radarr
-    image: lscr.io/linuxserver/radarr
-    restart_policy: unless-stopped
-    env:
-      - "TZ={{ TZ }}"
-      - "PUID={{ PUID }}"
-      - "PGID={{ PGID }}"
-    volumes:
-      - "{{ CONFIG_FOLDER }}/radarr/config:/config"
-      - "{{ DOWNLOAD_FOLDER }}:/downloads"
-      - "{{ MOVIE_FOLDER }}:/movie"
-      - "{{ MOVIE_ANIME_FOLDER }}:/movie-anime"
-    ports:
-      - 8787:7878
-
 - name: Deploy Radarr 4k
   community.docker.docker_container:
     name: radarr
@@ -137,10 +120,39 @@
     volumes:
       - "{{ CONFIG_FOLDER }}/radarr/config:/config"
       - "{{ DOWNLOAD_FOLDER }}:/downloads"
-      - "{{ MOVIE_4k_FOLDER }}:/movie"
+      - "{{ MOVIE_4K_FOLDER }}:/movie"
     ports:
       - 8787:7878
 
+# Distributable Transcoding Server
+- name: Deploy Tdarr
+  community.docker.docker_container:
+    name: tdarr-server
+    image: ghcr.io/haveagitgat/tdarr
+    restart_policy: unless-stopped
+    network_mode: bridge
+    env:
+      - "TZ={{ TZ }}"
+      - "PUID={{ PUID }}"
+      - "PGID={{ PGID }}"
+      - serverIP=0.0.0.0
+      - webUIPort=8265
+      - serverPort=8266
+      - internalNode=true
+      - nodeId=ServerNode
+      - NVIDIA_DRIVER_CAPABILITIES=all
+      - NVIDIA_VISIBLE_DEVICES=all
+    volumes:
+      - "{{ CONFIG_FOLDER }}/tdarr-server/server:/app/server"
+      - "{{ CONFIG_FOLDER }}/tdarr-server/config:/app/config"
+      - "{{ CONFIG_FOLDER }}/tdarr-server/logs:/app/logs"
+      - "{{ MEDIA_FOLDER }}:/content"
+      - /temp:/temp
+    ports:
+      - 8265:8265
+      - 8266:8266
+
+
 # Music Manager
 - name: Deploy Lidarr
   community.docker.docker_container:
diff --git a/applications/roles/media/tasks/main.yml b/applications/roles/media/tasks/main.yml
index 7769d74..0e39fcd 100644
--- a/applications/roles/media/tasks/main.yml
+++ b/applications/roles/media/tasks/main.yml
@@ -10,7 +10,7 @@
   linesinfile:
     state: present
     path: "/etc/fstab"
-    line: "UUID=<SET_THIS_VALUE> /mnt/content auto defaults 0 0"
+    line: "UUID={{ DISK_UUID }} /mnt/content auto defaults 0 0"
   notify:
     - Manual Share Mount