diff --git a/modules/nixos-modules/server/actual/proxy.nix b/modules/nixos-modules/server/actual/proxy.nix
index bf1711a..9d37574 100644
--- a/modules/nixos-modules/server/actual/proxy.nix
+++ b/modules/nixos-modules/server/actual/proxy.nix
@@ -14,9 +14,13 @@
       description = "extra domains that should be configured for actual";
       default = [];
     };
+    reverseProxy.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = config.services.actual.enable && config.services.reverseProxy.enable;
+    };
   };
 
-  config = lib.mkIf (config.services.actual.enable && config.services.reverseProxy.enable) {
+  config = lib.mkIf config.services.actual.reverseProxy.enable {
     services.reverseProxy.services.actual = {
       target = "http://localhost:${toString config.services.actual.settings.port}";
       domain = config.services.actual.domain;
diff --git a/modules/nixos-modules/server/forgejo/proxy.nix b/modules/nixos-modules/server/forgejo/proxy.nix
index bde59d1..c2d3131 100644
--- a/modules/nixos-modules/server/forgejo/proxy.nix
+++ b/modules/nixos-modules/server/forgejo/proxy.nix
@@ -8,6 +8,10 @@
 in {
   options.services.forgejo = {
     reverseProxy = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = config.services.forgejo.enable && config.services.reverseProxy.enable;
+      };
       domain = lib.mkOption {
         type = lib.types.str;
         description = "domain that forgejo will be hosted at";
@@ -21,7 +25,7 @@ in {
     };
   };
 
-  config = lib.mkIf (config.services.forgejo.enable && config.services.reverseProxy.enable) {
+  config = lib.mkIf config.services.forgejo.reverseProxy.enable {
     services.reverseProxy.services.forgejo = {
       target = "http://localhost:${toString httpPort}";
       domain = config.services.forgejo.reverseProxy.domain;
diff --git a/modules/nixos-modules/server/home-assistant/proxy.nix b/modules/nixos-modules/server/home-assistant/proxy.nix
index 1075c59..b756459 100644
--- a/modules/nixos-modules/server/home-assistant/proxy.nix
+++ b/modules/nixos-modules/server/home-assistant/proxy.nix
@@ -14,9 +14,15 @@
       description = "extra domains that should be configured for home-assistant";
       default = [];
     };
+    reverseProxy = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = config.services.reverseProxy.enable && config.services.home-assistant.enable;
+      };
+    };
   };
 
-  config = lib.mkIf (config.services.reverseProxy.enable && config.services.home-assistant.enable) {
+  config = lib.mkIf config.services.home-assistant.reverseProxy.enable {
     services.reverseProxy.services.home-assistant = {
       target = "http://localhost:${toString config.services.home-assistant.config.http.server_port}";
       domain = config.services.home-assistant.domain;
diff --git a/modules/nixos-modules/server/immich/proxy.nix b/modules/nixos-modules/server/immich/proxy.nix
index a50ea1e..9c8c165 100644
--- a/modules/nixos-modules/server/immich/proxy.nix
+++ b/modules/nixos-modules/server/immich/proxy.nix
@@ -14,9 +14,15 @@
       description = "extra domains that should be configured for immich";
       default = [];
     };
+    reverseProxy = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = config.services.immich.enable && config.services.reverseProxy.enable;
+      };
+    };
   };
 
-  config = lib.mkIf (config.services.immich.enable && config.services.reverseProxy.enable) {
+  config = lib.mkIf config.services.immich.reverseProxy.enable {
     services.reverseProxy.services.immich = {
       target = "http://localhost:${toString config.services.immich.port}";
       domain = config.services.immich.domain;
diff --git a/modules/nixos-modules/server/jellyfin/proxy.nix b/modules/nixos-modules/server/jellyfin/proxy.nix
index f803ecb..35289e7 100644
--- a/modules/nixos-modules/server/jellyfin/proxy.nix
+++ b/modules/nixos-modules/server/jellyfin/proxy.nix
@@ -16,9 +16,15 @@ in {
       description = "extra domains that should be configured for jellyfin";
       default = [];
     };
+    reverseProxy = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = config.services.jellyfin.enable && config.services.reverseProxy.enable;
+      };
+    };
   };
 
-  config = lib.mkIf (config.services.jellyfin.enable && config.services.reverseProxy.enable) {
+  config = lib.mkIf config.services.jellyfin.reverseProxy.enable {
     services.reverseProxy.services.jellyfin = {
       target = "http://localhost:${toString jellyfinPort}";
       domain = config.services.jellyfin.domain;
diff --git a/modules/nixos-modules/server/panoramax/proxy.nix b/modules/nixos-modules/server/panoramax/proxy.nix
index 35bc79b..7cd7111 100644
--- a/modules/nixos-modules/server/panoramax/proxy.nix
+++ b/modules/nixos-modules/server/panoramax/proxy.nix
@@ -14,9 +14,15 @@
       description = "extra domains that should be configured for panoramax";
       default = [];
     };
+    reverseProxy = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = config.services.panoramax.enable && config.services.reverseProxy.enable;
+      };
+    };
   };
 
-  config = lib.mkIf (config.services.panoramax.enable && config.services.reverseProxy.enable) {
+  config = lib.mkIf config.services.panoramax.reverseProxy.enable {
     services.reverseProxy.services.panoramax = {
       target = "http://localhost:${toString config.services.panoramax.port}";
       domain = config.services.panoramax.domain;
diff --git a/modules/nixos-modules/server/paperless/proxy.nix b/modules/nixos-modules/server/paperless/proxy.nix
index 04c8304..9d152c9 100644
--- a/modules/nixos-modules/server/paperless/proxy.nix
+++ b/modules/nixos-modules/server/paperless/proxy.nix
@@ -9,9 +9,15 @@
       description = "extra domains that should be configured for paperless";
       default = [];
     };
+    reverseProxy = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = config.services.paperless.enable && config.services.reverseProxy.enable;
+      };
+    };
   };
 
-  config = lib.mkIf (config.services.paperless.enable && config.services.reverseProxy.enable) {
+  config = lib.mkIf config.services.paperless.reverseProxy.enable {
     services.reverseProxy.services.paperless = {
       target = "http://${config.services.paperless.address}:${toString config.services.paperless.port}";
       domain = config.services.paperless.domain;
diff --git a/modules/nixos-modules/server/searx/proxy.nix b/modules/nixos-modules/server/searx/proxy.nix
index fbc80e0..e994e4a 100644
--- a/modules/nixos-modules/server/searx/proxy.nix
+++ b/modules/nixos-modules/server/searx/proxy.nix
@@ -9,9 +9,15 @@
       description = "extra domains that should be configured for searx";
       default = [];
     };
+    reverseProxy = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = config.services.searx.enable && config.services.reverseProxy.enable;
+      };
+    };
   };
 
-  config = lib.mkIf (config.services.searx.enable && config.services.reverseProxy.enable) {
+  config = lib.mkIf config.services.searx.reverseProxy.enable {
     services.reverseProxy.services.searx = {
       target = "http://localhost:${toString config.services.searx.settings.server.port}";
       domain = config.services.searx.domain;