diff --git a/hosts/nixos/hs/containers.nix b/hosts/nixos/hs/containers.nix
index fd0f55e..a391669 100644
--- a/hosts/nixos/hs/containers.nix
+++ b/hosts/nixos/hs/containers.nix
@@ -178,5 +178,57 @@ in
       autoStart = true;
     };
 
+    # Sonarr TV show management
+    sonarr = {
+      image = "docker.io/linuxserver/sonarr:latest";
+
+      volumes = [
+        "/var/lib/containers/config/sonarr:/config"
+        "/mnt/storage/Media:/data"
+      ];
+
+      environment = {
+        PUID = commonUID;
+        PGID = commonGID;
+        TZ = systemTZ;
+      };
+
+      ports = [
+        "5003:8989"
+      ];
+
+      extraOptions = [
+        "--network=podman"
+      ];
+
+      autoStart = true;
+    };
+
+    # Radarr movie management
+    radarr = {
+      image = "docker.io/linuxserver/radarr:latest";
+
+      volumes = [
+        "/var/lib/containers/config/radarr:/config"
+        "/mnt/storage/Media:/data"
+      ];
+
+      environment = {
+        PUID = commonUID;
+        PGID = commonGID;
+        TZ = systemTZ;
+      };
+
+      ports = [
+        "5004:7878"
+      ];
+
+      extraOptions = [
+        "--network=podman"
+      ];
+
+      autoStart = true;
+    };
+
   };
 }
diff --git a/hosts/nixos/vps/proxy.nix b/hosts/nixos/vps/proxy.nix
index ba98e61..608b209 100644
--- a/hosts/nixos/vps/proxy.nix
+++ b/hosts/nixos/vps/proxy.nix
@@ -54,6 +54,30 @@
           };
         };
 
+        # Sonarr TV show management
+        sonarr = {
+          rule = "Host(`sonarr.yanlincs.com`)";
+          service = "sonarr";
+          tls = {
+            certResolver = "cloudflare";
+            domains = [{
+              main = "*.yanlincs.com";
+            }];
+          };
+        };
+
+        # Radarr movie management
+        radarr = {
+          rule = "Host(`radarr.yanlincs.com`)";
+          service = "radarr";
+          tls = {
+            certResolver = "cloudflare";
+            domains = [{
+              main = "*.yanlincs.com";
+            }];
+          };
+        };
+
       };
 
       services = {
@@ -94,6 +118,24 @@
           };
         };
 
+        # Sonarr backend (via WireGuard)
+        sonarr = {
+          loadBalancer = {
+            servers = [{
+              url = "http://10.2.2.20:5003";
+            }];
+          };
+        };
+
+        # Radarr backend (via WireGuard)
+        radarr = {
+          loadBalancer = {
+            servers = [{
+              url = "http://10.2.2.20:5004";
+            }];
+          };
+        };
+
       };
 
     };
diff --git a/modules/homebrew.nix b/modules/homebrew.nix
index f564256..b384745 100644
--- a/modules/homebrew.nix
+++ b/modules/homebrew.nix
@@ -35,7 +35,6 @@
       "hiddenbar"
       "localsend"
       "calibre"
-      "mediaelch"
     ];
     taps = [
       # Additional repositories if needed