diff --git a/flake.lock b/flake.lock
index 68fa8d6..2eff24a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -136,11 +136,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743438213,
-        "narHash": "sha256-ZZDN+0v1r4I1xkQWlt8euOJv5S4EvElUCZMrDjTCEsY=",
+        "lastModified": 1742771635,
+        "narHash": "sha256-HQHzQPrg+g22tb3/K/4tgJjPzM+/5jbaujCZd8s2Mls=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ccd7df836e1f42ea84806760f25b77b586370259",
+        "rev": "ad0614a1ec9cce3b13169e20ceb7e55dfaf2a818",
         "type": "github"
       },
       "original": {
@@ -152,11 +152,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743315132,
-        "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
+        "lastModified": 1742669843,
+        "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
+        "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
         "type": "github"
       },
       "original": {
diff --git a/modules/nixos/services/servarr/bazarr.nix b/modules/nixos/services/servarr/bazarr.nix
index 637da0c..01af9c4 100644
--- a/modules/nixos/services/servarr/bazarr.nix
+++ b/modules/nixos/services/servarr/bazarr.nix
@@ -3,7 +3,7 @@ let
   cfg = config.my.services.servarr.bazarr;
 in
 {
-  options.my.services.servarr.bazarr = with lib; {
+  options.my.services.servarr = with lib; {
     enable = lib.mkEnableOption "Bazarr" // {
       default = config.my.services.servarr.enableAll;
     };
diff --git a/modules/nixos/services/servarr/default.nix b/modules/nixos/services/servarr/default.nix
index 23838fd..8fd9b20 100644
--- a/modules/nixos/services/servarr/default.nix
+++ b/modules/nixos/services/servarr/default.nix
@@ -8,8 +8,8 @@
     ./bazarr.nix
     ./jackett.nix
     ./nzbhydra.nix
-    ./prowlarr.nix
     (import ./starr.nix "lidarr")
+    (import ./starr.nix "prowlarr")
     (import ./starr.nix "radarr")
     (import ./starr.nix "readarr")
     (import ./starr.nix "sonarr")
diff --git a/modules/nixos/services/servarr/jackett.nix b/modules/nixos/services/servarr/jackett.nix
index 481cd3d..c838c52 100644
--- a/modules/nixos/services/servarr/jackett.nix
+++ b/modules/nixos/services/servarr/jackett.nix
@@ -3,7 +3,7 @@ let
   cfg = config.my.services.servarr.jackett;
 in
 {
-  options.my.services.servarr.jackett = with lib; {
+  options.my.services.servarr = with lib; {
     enable = lib.mkEnableOption "Jackett" // {
       default = config.my.services.servarr.enableAll;
     };
diff --git a/modules/nixos/services/servarr/nzbhydra.nix b/modules/nixos/services/servarr/nzbhydra.nix
index 7b63986..05742d6 100644
--- a/modules/nixos/services/servarr/nzbhydra.nix
+++ b/modules/nixos/services/servarr/nzbhydra.nix
@@ -3,7 +3,7 @@ let
   cfg = config.my.services.servarr.nzbhydra;
 in
 {
-  options.my.services.servarr.nzbhydra = with lib; {
+  options.my.services.servarr = with lib; {
     enable = lib.mkEnableOption "NZBHydra2" // {
       default = config.my.services.servarr.enableAll;
     };
diff --git a/modules/nixos/services/servarr/prowlarr.nix b/modules/nixos/services/servarr/prowlarr.nix
deleted file mode 100644
index ce044c6..0000000
--- a/modules/nixos/services/servarr/prowlarr.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-# Torrent and NZB indexer
-{ config, lib, ... }:
-let
-  cfg = config.my.services.servarr.prowlarr;
-in
-{
-  options.my.services.servarr.prowlarr = with lib; {
-    enable = lib.mkEnableOption "Prowlarr" // {
-      default = config.my.services.servarr.enableAll;
-    };
-
-    port = mkOption {
-      type = types.port;
-      default = 9696;
-      example = 8080;
-      description = "Internal port for webui";
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.prowlarr = {
-      enable = true;
-
-      settings = {
-        server = {
-          port = cfg.port;
-        };
-      };
-    };
-
-    my.services.nginx.virtualHosts = {
-      prowlarr = {
-        inherit (cfg) port;
-      };
-    };
-
-    services.fail2ban.jails = {
-      prowlarr = ''
-        enabled = true
-        filter = prowlarr
-        action = iptables-allports
-      '';
-    };
-
-    environment.etc = {
-      "fail2ban/filter.d/prowlarr.conf".text = ''
-        [Definition]
-        failregex = ^.*\|Warn\|Auth\|Auth-Failure ip <HOST> username .*$
-        journalmatch = _SYSTEMD_UNIT=prowlarr.service
-      '';
-    };
-  };
-}
diff --git a/modules/nixos/services/servarr/starr.nix b/modules/nixos/services/servarr/starr.nix
index 2bf7c11..3b0e3ec 100644
--- a/modules/nixos/services/servarr/starr.nix
+++ b/modules/nixos/services/servarr/starr.nix
@@ -5,6 +5,7 @@ let
   cfg = config.my.services.servarr.${starr};
   ports = {
     lidarr = 8686;
+    prowlarr = 9696;
     radarr = 7878;
     readarr = 8787;
     sonarr = 8989;