diff --git a/nixos/tsuba/default.nix b/nixos/tsuba/default.nix
index 98e61a28..8a8eb8b6 100644
--- a/nixos/tsuba/default.nix
+++ b/nixos/tsuba/default.nix
@@ -14,6 +14,7 @@
           inputs
           // {
             inherit device;
+            unstablePkgs = inputs.nixpkgs.legacyPackages.${device.system};
           };
         system = device.system;
         modules = [
@@ -29,8 +30,8 @@
             ];
           }
           ./configuration.nix
-          ./disk-config.nix
           ./services
+          ./disk-config.nix
           ./${name}.nix
         ];
       }
diff --git a/nixos/tsuba/services/caddy.nix b/nixos/tsuba/services/caddy.nix
index 4a8d3325..fc3462f7 100644
--- a/nixos/tsuba/services/caddy.nix
+++ b/nixos/tsuba/services/caddy.nix
@@ -18,7 +18,7 @@
         (hetzner) {
             tls {
                 propagation_timeout -1
-                propagation_delay 30s
+                propagation_delay 120s
                 dns hetzner {env.HETZNER_API_KEY}
             }
         }
diff --git a/nixos/tsuba/services/default.nix b/nixos/tsuba/services/default.nix
index ef211bc1..7f2fdb45 100644
--- a/nixos/tsuba/services/default.nix
+++ b/nixos/tsuba/services/default.nix
@@ -4,9 +4,10 @@
     ./samba.nix
     ./jellyfin.nix
     ./caddy.nix
-    ./sonarr.nix
-    ./radarr.nix
-    ./prowlarr.nix
+    ./servarr.nix
+    # ./sonarr.nix
+    # ./radarr.nix
+    # ./prowlarr.nix
     ./deluge.nix
   ];
 }
diff --git a/nixos/tsuba/services/deluge.nix b/nixos/tsuba/services/deluge.nix
index 68c5acfb..2db4b792 100644
--- a/nixos/tsuba/services/deluge.nix
+++ b/nixos/tsuba/services/deluge.nix
@@ -1,6 +1,9 @@
 {...}: {
   services = {
-    deluge.enable = true;
+    deluge = {
+      enable = true;
+      web.enable = true;
+    };
     caddy = {
       virtualHosts."deluge.tsuba.darksailor.dev".extraConfig = ''
         import hetzner
diff --git a/nixos/tsuba/services/jellyfin.nix b/nixos/tsuba/services/jellyfin.nix
index adf46722..2f2afe54 100644
--- a/nixos/tsuba/services/jellyfin.nix
+++ b/nixos/tsuba/services/jellyfin.nix
@@ -1,11 +1,12 @@
 {...}: {
-  services = {
-    # jellyfin.enable = true;
-    jellyseerr.enable = true;
-    caddy = {
-      virtualHosts."jellyfin.tsuba.darksailor.dev".extraConfig = ''
-        reverse_proxy localhost:8096
-      '';
-    };
-  };
+  # services = {
+  #   jellyseerr.enable = true;
+  #   jellyfin.enable = true;
+  #   caddy = {
+  #     virtualHosts."jellyfin.tsuba.darksailor.dev".extraConfig = ''
+  #       import hetzner
+  #       reverse_proxy localhost:8096
+  #     '';
+  #   };
+  # };
 }
diff --git a/nixos/tsuba/services/prowlarr.nix b/nixos/tsuba/services/prowlarr.nix
index e1e17e57..3af246f8 100644
--- a/nixos/tsuba/services/prowlarr.nix
+++ b/nixos/tsuba/services/prowlarr.nix
@@ -1,6 +1,9 @@
-{...}: {
+{unstablePkgs, ...}: {
   services = {
-    prowlarr.enable = true;
+    prowlarr = {
+      enable = true;
+      package = unstablePkgs.prowlarr;
+    };
     caddy = {
       virtualHosts."prowlarr.tsuba.darksailor.dev".extraConfig = ''
         import hetzner
diff --git a/nixos/tsuba/services/servarr.nix b/nixos/tsuba/services/servarr.nix
new file mode 100644
index 00000000..08539c43
--- /dev/null
+++ b/nixos/tsuba/services/servarr.nix
@@ -0,0 +1,23 @@
+{
+  unstablePkgs,
+  config,
+  ...
+}: let
+  mkServarr = name: {
+    ${name} = {
+      enable = true;
+      package = unstablePkgs.${name};
+    };
+    caddy.virtualHosts."${name}.tsuba.darksailor.dev".extraConfig = ''
+      import hetzner
+      reverse_proxy localhost:${builtins.toString config.services.${name}.settings.server.port}
+    '';
+  };
+in {
+  services =
+    mkServarr "radarr"
+    // mkServarr "sonarr"
+    // mkServarr "prowlarr";
+  # // mkServarr "readarr"
+  # // mkServarr "bazarr";
+}
diff --git a/nixos/tsuba/services/sonarr.nix b/nixos/tsuba/services/sonarr.nix
index b28eb1a0..a0976d10 100644
--- a/nixos/tsuba/services/sonarr.nix
+++ b/nixos/tsuba/services/sonarr.nix
@@ -1,6 +1,10 @@
-{...}: {
+{unstablePkgs, ...}: {
   services = {
-    sonarr.enable = true;
+    sonarr = {
+      enable = true;
+      package = unstablePkgs.sonarr;
+    };
+
     caddy = {
       virtualHosts."sonarr.tsuba.darksailor.dev".extraConfig = ''
         import hetzner