diff --git a/modules/nixos-modules/server/actual/default.nix b/modules/nixos-modules/server/actual/default.nix
index bef7a05..546240e 100644
--- a/modules/nixos-modules/server/actual/default.nix
+++ b/modules/nixos-modules/server/actual/default.nix
@@ -12,14 +12,6 @@ in {
     ./impermanence.nix
   ];
 
-  options.services.actual = {
-    subdomain = lib.mkOption {
-      type = lib.types.str;
-      default = "actual";
-      description = "subdomain of base domain that actual will be hosted at";
-    };
-  };
-
   config = lib.mkIf config.services.actual.enable {
     systemd.tmpfiles.rules = [
       "d ${dataDirectory} 2770 actual actual"
diff --git a/modules/nixos-modules/server/actual/proxy.nix b/modules/nixos-modules/server/actual/proxy.nix
index e20a6cd..6ca51e4 100644
--- a/modules/nixos-modules/server/actual/proxy.nix
+++ b/modules/nixos-modules/server/actual/proxy.nix
@@ -3,6 +3,14 @@
   config,
   ...
 }: {
+  options.services.actual = {
+    subdomain = lib.mkOption {
+      type = lib.types.str;
+      default = "actual";
+      description = "subdomain of base domain that actual will be hosted at";
+    };
+  };
+
   config = lib.mkIf (config.services.actual.enable && config.host.reverse_proxy.enable) {
     host = {
       reverse_proxy.subdomains.${config.services.actual.subdomain} = {
diff --git a/modules/nixos-modules/server/forgejo/default.nix b/modules/nixos-modules/server/forgejo/default.nix
index cec2630..1fdc8d9 100644
--- a/modules/nixos-modules/server/forgejo/default.nix
+++ b/modules/nixos-modules/server/forgejo/default.nix
@@ -15,14 +15,6 @@ in {
     ./impermanence.nix
   ];
 
-  options.services.forgejo = {
-    subdomain = lib.mkOption {
-      type = lib.types.str;
-      description = "subdomain of base domain that forgejo will be hosted at";
-      default = "forgejo";
-    };
-  };
-
   config = lib.mkIf config.services.forgejo.enable {
     assertions = [
       {
diff --git a/modules/nixos-modules/server/forgejo/proxy.nix b/modules/nixos-modules/server/forgejo/proxy.nix
index 9e85f78..51f769d 100644
--- a/modules/nixos-modules/server/forgejo/proxy.nix
+++ b/modules/nixos-modules/server/forgejo/proxy.nix
@@ -6,6 +6,14 @@
   const = import ./const.nix;
   httpPort = const.httpPort;
 in {
+  options.services.forgejo = {
+    subdomain = lib.mkOption {
+      type = lib.types.str;
+      description = "subdomain of base domain that forgejo will be hosted at";
+      default = "forgejo";
+    };
+  };
+
   config = lib.mkIf (config.services.forgejo.enable && config.host.reverse_proxy.enable) {
     host.reverse_proxy.subdomains.${config.services.forgejo.subdomain} = {
       target = "http://localhost:${toString httpPort}";
diff --git a/modules/nixos-modules/server/home-assistant/default.nix b/modules/nixos-modules/server/home-assistant/default.nix
index 6edf0c0..83d8ba7 100644
--- a/modules/nixos-modules/server/home-assistant/default.nix
+++ b/modules/nixos-modules/server/home-assistant/default.nix
@@ -12,12 +12,6 @@
   ];
 
   options.services.home-assistant = {
-    subdomain = lib.mkOption {
-      type = lib.types.str;
-      description = "subdomain of base domain that home-assistant will be hosted at";
-      default = "home-assistant";
-    };
-
     database = lib.mkOption {
       type = lib.types.enum [
         "builtin"
diff --git a/modules/nixos-modules/server/home-assistant/proxy.nix b/modules/nixos-modules/server/home-assistant/proxy.nix
index 63396b5..ba8f20d 100644
--- a/modules/nixos-modules/server/home-assistant/proxy.nix
+++ b/modules/nixos-modules/server/home-assistant/proxy.nix
@@ -2,23 +2,32 @@
   lib,
   config,
   ...
-}:
-lib.mkIf (config.host.reverse_proxy.enable && config.services.home-assistant.enable) {
-  host = {
-    reverse_proxy.subdomains.${config.services.home-assistant.subdomain} = {
-      target = "http://localhost:${toString config.services.home-assistant.config.http.server_port}";
+}: {
+  options.services.home-assistant = {
+    subdomain = lib.mkOption {
+      type = lib.types.str;
+      description = "subdomain of base domain that home-assistant will be hosted at";
+      default = "home-assistant";
+    };
+  };
 
-      websockets.enable = true;
-      forwardHeaders.enable = true;
+  config = lib.mkIf (config.host.reverse_proxy.enable && config.services.home-assistant.enable) {
+    host = {
+      reverse_proxy.subdomains.${config.services.home-assistant.subdomain} = {
+        target = "http://localhost:${toString config.services.home-assistant.config.http.server_port}";
 
-      extraConfig = ''
-        add_header Upgrade $http_upgrade;
-        add_header Connection \"upgrade\";
+        websockets.enable = true;
+        forwardHeaders.enable = true;
 
-        proxy_buffering off;
+        extraConfig = ''
+          add_header Upgrade $http_upgrade;
+          add_header Connection \"upgrade\";
 
-        proxy_read_timeout 90;
-      '';
+          proxy_buffering off;
+
+          proxy_read_timeout 90;
+        '';
+      };
     };
   };
 }
diff --git a/modules/nixos-modules/server/immich/default.nix b/modules/nixos-modules/server/immich/default.nix
index 9d782f0..4d93c0b 100644
--- a/modules/nixos-modules/server/immich/default.nix
+++ b/modules/nixos-modules/server/immich/default.nix
@@ -1,4 +1,4 @@
-{lib, ...}: {
+{...}: {
   imports = [
     ./proxy.nix
     ./database.nix
@@ -6,14 +6,6 @@
     ./impermanence.nix
   ];
 
-  options.services.immich = {
-    subdomain = lib.mkOption {
-      type = lib.types.str;
-      description = "subdomain of base domain that immich will be hosted at";
-      default = "immich";
-    };
-  };
-
   # NOTE: This shouldn't be needed now that we are out of testing
   # config = lib.mkIf config.services.immich.enable {
   #   networking.firewall.interfaces.${config.services.tailscale.interfaceName} = {
diff --git a/modules/nixos-modules/server/immich/proxy.nix b/modules/nixos-modules/server/immich/proxy.nix
index 9d8790a..dae2420 100644
--- a/modules/nixos-modules/server/immich/proxy.nix
+++ b/modules/nixos-modules/server/immich/proxy.nix
@@ -3,6 +3,14 @@
   config,
   ...
 }: {
+  options.services.immich = {
+    subdomain = lib.mkOption {
+      type = lib.types.str;
+      description = "subdomain of base domain that immich will be hosted at";
+      default = "immich";
+    };
+  };
+
   config = lib.mkIf (config.services.immich.enable && config.host.reverse_proxy.enable) {
     host = {
       reverse_proxy.subdomains.${config.services.immich.subdomain} = {
diff --git a/modules/nixos-modules/server/jellyfin/default.nix b/modules/nixos-modules/server/jellyfin/default.nix
index 238ce3a..0d88481 100644
--- a/modules/nixos-modules/server/jellyfin/default.nix
+++ b/modules/nixos-modules/server/jellyfin/default.nix
@@ -14,16 +14,6 @@ in {
   ];
 
   options.services.jellyfin = {
-    subdomain = lib.mkOption {
-      type = lib.types.str;
-      description = "subdomain of base domain that jellyfin will be hosted at";
-      default = "jellyfin";
-    };
-    extraSubdomains = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      description = "ex subdomain of base domain that jellyfin will be hosted at";
-      default = [];
-    };
     media_directory = lib.mkOption {
       type = lib.types.str;
       description = "directory jellyfin media will be hosted at";
diff --git a/modules/nixos-modules/server/jellyfin/proxy.nix b/modules/nixos-modules/server/jellyfin/proxy.nix
index 5edb865..1020a19 100644
--- a/modules/nixos-modules/server/jellyfin/proxy.nix
+++ b/modules/nixos-modules/server/jellyfin/proxy.nix
@@ -5,6 +5,19 @@
 }: let
   jellyfinPort = 8096;
 in {
+  options.services.jellyfin = {
+    subdomain = lib.mkOption {
+      type = lib.types.str;
+      description = "subdomain of base domain that jellyfin will be hosted at";
+      default = "jellyfin";
+    };
+    extraSubdomains = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      description = "ex subdomain of base domain that jellyfin will be hosted at";
+      default = [];
+    };
+  };
+
   config = lib.mkIf (config.services.jellyfin.enable && config.host.reverse_proxy.enable) {
     host.reverse_proxy.subdomains.jellyfin = {
       target = "http://localhost:${toString jellyfinPort}";
diff --git a/modules/nixos-modules/server/panoramax/default.nix b/modules/nixos-modules/server/panoramax/default.nix
index e506b80..779f284 100644
--- a/modules/nixos-modules/server/panoramax/default.nix
+++ b/modules/nixos-modules/server/panoramax/default.nix
@@ -57,12 +57,6 @@ in {
       description = "The panoramax package to use";
     };
 
-    subdomain = lib.mkOption {
-      type = lib.types.str;
-      description = "subdomain of base domain that panoramax will be hosted at";
-      default = "panoramax";
-    };
-
     database = {
       createDB = mkOption {
         type = types.bool;
diff --git a/modules/nixos-modules/server/panoramax/proxy.nix b/modules/nixos-modules/server/panoramax/proxy.nix
index 70e3f5b..79f9326 100644
--- a/modules/nixos-modules/server/panoramax/proxy.nix
+++ b/modules/nixos-modules/server/panoramax/proxy.nix
@@ -3,6 +3,14 @@
   config,
   ...
 }: {
+  options.services.panoramax = {
+    subdomain = lib.mkOption {
+      type = lib.types.str;
+      description = "subdomain of base domain that panoramax will be hosted at";
+      default = "panoramax";
+    };
+  };
+
   config = lib.mkIf (config.services.panoramax.enable && config.host.reverse_proxy.enable) {
     host = {
       reverse_proxy.subdomains.${config.services.panoramax.subdomain} = {
diff --git a/modules/nixos-modules/server/paperless/default.nix b/modules/nixos-modules/server/paperless/default.nix
index ec01fef..a6878eb 100644
--- a/modules/nixos-modules/server/paperless/default.nix
+++ b/modules/nixos-modules/server/paperless/default.nix
@@ -11,11 +11,6 @@
   ];
 
   options.services.paperless = {
-    subdomain = lib.mkOption {
-      type = lib.types.str;
-      description = "subdomain of base domain that paperless will be hosted at";
-      default = "paperless";
-    };
     database = {
       user = lib.mkOption {
         type = lib.types.str;
diff --git a/modules/nixos-modules/server/paperless/proxy.nix b/modules/nixos-modules/server/paperless/proxy.nix
index cb0f157..2910f07 100644
--- a/modules/nixos-modules/server/paperless/proxy.nix
+++ b/modules/nixos-modules/server/paperless/proxy.nix
@@ -3,6 +3,14 @@
   lib,
   ...
 }: {
+  options.services.paperless = {
+    subdomain = lib.mkOption {
+      type = lib.types.str;
+      description = "subdomain of base domain that paperless will be hosted at";
+      default = "paperless";
+    };
+  };
+
   config = lib.mkIf (config.services.paperless.enable && config.host.reverse_proxy.enable) {
     host = {
       reverse_proxy.subdomains.${config.services.paperless.subdomain} = {
diff --git a/modules/nixos-modules/server/searx/default.nix b/modules/nixos-modules/server/searx/default.nix
index 73ec489..ac84c1d 100644
--- a/modules/nixos-modules/server/searx/default.nix
+++ b/modules/nixos-modules/server/searx/default.nix
@@ -8,14 +8,6 @@
     ./proxy.nix
   ];
 
-  options.services.searx = {
-    subdomain = lib.mkOption {
-      type = lib.types.str;
-      description = "subdomain of base domain that searx will be hosted at";
-      default = "searx";
-    };
-  };
-
   config = lib.mkIf config.services.searx.enable {
     sops.secrets = {
       "services/searx" = {
diff --git a/modules/nixos-modules/server/searx/proxy.nix b/modules/nixos-modules/server/searx/proxy.nix
index d925918..0c1eae1 100644
--- a/modules/nixos-modules/server/searx/proxy.nix
+++ b/modules/nixos-modules/server/searx/proxy.nix
@@ -3,6 +3,14 @@
   lib,
   ...
 }: {
+  options.services.searx = {
+    subdomain = lib.mkOption {
+      type = lib.types.str;
+      description = "subdomain of base domain that searx will be hosted at";
+      default = "searx";
+    };
+  };
+
   config = lib.mkIf (config.services.searx.enable && config.host.reverse_proxy.enable) {
     host = {
       reverse_proxy.subdomains.searx = {