diff --git a/modules/factories/base.nix b/modules/factories/mkscript.nix
similarity index 100%
rename from modules/factories/base.nix
rename to modules/factories/mkscript.nix
diff --git a/modules/factories/setup.nix b/modules/factories/mkserver.nix
similarity index 100%
rename from modules/factories/setup.nix
rename to modules/factories/mkserver.nix
diff --git a/modules/network/nginx.nix b/modules/network/nginx.nix
index ea69022..099e7fc 100644
--- a/modules/network/nginx.nix
+++ b/modules/network/nginx.nix
@@ -1,6 +1,6 @@
 { lib, config, ... }:
 let
-  setup = import ../servers/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
   proxyReverseServices = [
     "firefox-syncserver"
     "readeck"
diff --git a/modules/scripts/download.nix b/modules/scripts/download.nix
index 1e788ff..b435047 100644
--- a/modules/scripts/download.nix
+++ b/modules/scripts/download.nix
@@ -6,7 +6,7 @@
   ...
 }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   options.my.units = {
     download.enable = lib.mkEnableOption "enable";
     downloadManga.enable = lib.mkEnableOption "enable";
diff --git a/modules/scripts/ffmpeg4discord.nix b/modules/scripts/ffmpeg4discord.nix
index b77a59c..735934f 100644
--- a/modules/scripts/ffmpeg4discord.nix
+++ b/modules/scripts/ffmpeg4discord.nix
@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.ffmpeg4discord = {
     enable = lib.mkDefault false;
     install = true;
diff --git a/modules/scripts/ffmpreg.nix b/modules/scripts/ffmpreg.nix
index 3a63194..ce7f918 100644
--- a/modules/scripts/ffmpreg.nix
+++ b/modules/scripts/ffmpreg.nix
@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.ffmpreg = {
     enable = lib.mkDefault false;
     install = true;
diff --git a/modules/scripts/find-dup-episode.nix b/modules/scripts/find-dup-episode.nix
index af624af..9f02e84 100644
--- a/modules/scripts/find-dup-episode.nix
+++ b/modules/scripts/find-dup-episode.nix
@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.find-dup-episodes = {
     enable = lib.mkDefault false;
     install = true;
diff --git a/modules/scripts/library-report.nix b/modules/scripts/library-report.nix
index d6b8f15..fbbe1d2 100644
--- a/modules/scripts/library-report.nix
+++ b/modules/scripts/library-report.nix
@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.library-report = {
     enable = lib.mkDefault false;
     install = true;
diff --git a/modules/scripts/manage-library.nix b/modules/scripts/manage-library.nix
index be8ef5d..0be7a47 100644
--- a/modules/scripts/manage-library.nix
+++ b/modules/scripts/manage-library.nix
@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.manage-library = {
     enable = lib.mkDefault false;
     install = true;
diff --git a/modules/scripts/pika-list.nix b/modules/scripts/pika-list.nix
index f71fcc8..804bb13 100644
--- a/modules/scripts/pika-list.nix
+++ b/modules/scripts/pika-list.nix
@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.pika-list = {
     enable = lib.mkDefault false;
     install = true;
diff --git a/modules/scripts/run.nix b/modules/scripts/run.nix
index 40833d8..5effd53 100644
--- a/modules/scripts/run.nix
+++ b/modules/scripts/run.nix
@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.run = {
     enable = lib.mkDefault false;
     install = true;
diff --git a/modules/scripts/split-dir.nix b/modules/scripts/split-dir.nix
index 19142ab..c65bed2 100644
--- a/modules/scripts/split-dir.nix
+++ b/modules/scripts/split-dir.nix
@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.split-dir = {
     enable = lib.mkDefault false;
     install = true;
diff --git a/modules/scripts/stream-dl.nix b/modules/scripts/stream-dl.nix
index 83c7f57..677c7e1 100644
--- a/modules/scripts/stream-dl.nix
+++ b/modules/scripts/stream-dl.nix
@@ -6,7 +6,7 @@
   ...
 }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   options.my.units.stream-dl.enable = lib.mkEnableOption "enable";
   config =
     let
diff --git a/modules/scripts/tasks.nix b/modules/scripts/tasks.nix
index 8ee7014..1d6c60f 100644
--- a/modules/scripts/tasks.nix
+++ b/modules/scripts/tasks.nix
@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.tasks = {
     enable = lib.mkDefault false;
     install = true;
diff --git a/modules/scripts/tuh-activity-logger.nix b/modules/scripts/tuh-activity-logger.nix
index c78f029..b0038d4 100644
--- a/modules/scripts/tuh-activity-logger.nix
+++ b/modules/scripts/tuh-activity-logger.nix
@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.tuh-activity-logger = {
     enable = lib.mkDefault false;
     install = true;
diff --git a/modules/scripts/update-dns.nix b/modules/scripts/update-dns.nix
index be9a26b..8b3ae29 100644
--- a/modules/scripts/update-dns.nix
+++ b/modules/scripts/update-dns.nix
@@ -6,7 +6,7 @@
   ...
 }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config = lib.mkIf config.my.secureHost {
     sops.secrets = {
       cloudflare-api.sopsFile = ../../secrets/env.yaml;
diff --git a/modules/scripts/update-org-agenda-cache.nix b/modules/scripts/update-org-agenda-cache.nix
index 30be984..c9ceb58 100644
--- a/modules/scripts/update-org-agenda-cache.nix
+++ b/modules/scripts/update-org-agenda-cache.nix
@@ -5,7 +5,7 @@
   ...
 }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.update-org-agenda-cache = {
     enable = lib.mkDefault false;
     install = config.my.emacs.enable;
diff --git a/modules/servers/atticd.nix b/modules/servers/atticd.nix
index 14d351e..e90b041 100644
--- a/modules/servers/atticd.nix
+++ b/modules/servers/atticd.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.atticd;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.atticd = setup.mkOptions "atticd" "cache" 2343;
diff --git a/modules/servers/audiobookshelf.nix b/modules/servers/audiobookshelf.nix
index 9108bad..cdcb04d 100644
--- a/modules/servers/audiobookshelf.nix
+++ b/modules/servers/audiobookshelf.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.audiobookshelf;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.audiobookshelf = setup.mkOptions "audiobookshelf" "audiobooks" 5687;
diff --git a/modules/servers/bazarr.nix b/modules/servers/bazarr.nix
index a344496..b7617ac 100644
--- a/modules/servers/bazarr.nix
+++ b/modules/servers/bazarr.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.bazarr;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.bazarr = setup.mkOptions "bazarr" "subs" config.services.bazarr.listenPort;
diff --git a/modules/servers/drpp.nix b/modules/servers/drpp.nix
index b7d4e70..9481770 100644
--- a/modules/servers/drpp.nix
+++ b/modules/servers/drpp.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.drpp;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.drpp = setup.mkOptions "drpp" "drpp" 0;
diff --git a/modules/servers/firefox-syncserver.nix b/modules/servers/firefox-syncserver.nix
index 045ae20..04e486d 100644
--- a/modules/servers/firefox-syncserver.nix
+++ b/modules/servers/firefox-syncserver.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.firefox-syncserver;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.firefox-syncserver = setup.mkOptions "firefox-syncserver" "sync" 4233;
diff --git a/modules/servers/flame.nix b/modules/servers/flame.nix
index 2bfe0e1..f77c929 100644
--- a/modules/servers/flame.nix
+++ b/modules/servers/flame.nix
@@ -3,7 +3,7 @@ let
   cfg = config.my.servers.flame;
   cfgS = config.my.servers.flameSecret;
   enable = (cfg.enable || cfgS.enable) && config.my.secureHost;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers = {
diff --git a/modules/servers/gitea.nix b/modules/servers/gitea.nix
index a885512..cfcb31d 100644
--- a/modules/servers/gitea.nix
+++ b/modules/servers/gitea.nix
@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.my.servers.gitea;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   imports = [
diff --git a/modules/servers/homepage.nix b/modules/servers/homepage.nix
index 21e390a..49d6290 100644
--- a/modules/servers/homepage.nix
+++ b/modules/servers/homepage.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.homepage;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.homepage = setup.mkOptions "homepage" "home" 8082;
diff --git a/modules/servers/jellyfin.nix b/modules/servers/jellyfin.nix
index d863057..3cf1469 100644
--- a/modules/servers/jellyfin.nix
+++ b/modules/servers/jellyfin.nix
@@ -19,7 +19,7 @@ let
     pkgs.gum
     sub-sync
   ];
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.jellyfin = setup.mkOptions "jellyfin" "flix" 8096;
diff --git a/modules/servers/kavita.nix b/modules/servers/kavita.nix
index 3d78853..c37f0cc 100644
--- a/modules/servers/kavita.nix
+++ b/modules/servers/kavita.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.kavita;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.kavita = setup.mkOptions "kavita" "library" config.services.kavita.settings.Port;
diff --git a/modules/servers/lidarr.nix b/modules/servers/lidarr.nix
index 970aae5..86204a3 100644
--- a/modules/servers/lidarr.nix
+++ b/modules/servers/lidarr.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.lidarr;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.lidarr = setup.mkOptions "lidarr" "music" 8686;
diff --git a/modules/servers/maloja.nix b/modules/servers/maloja.nix
index 7ba1787..1476e3d 100644
--- a/modules/servers/maloja.nix
+++ b/modules/servers/maloja.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.maloja;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.maloja = setup.mkOptions "maloja" "maloja" 42010;
diff --git a/modules/servers/mealie.nix b/modules/servers/mealie.nix
index 8e7bcae..5187b03 100644
--- a/modules/servers/mealie.nix
+++ b/modules/servers/mealie.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.mealie;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.mealie = setup.mkOptions "mealie" "mealie" 9925;
diff --git a/modules/servers/metube.nix b/modules/servers/metube.nix
index d327dc5..cc49aeb 100644
--- a/modules/servers/metube.nix
+++ b/modules/servers/metube.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.metube;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.metube = setup.mkOptions "metube" "bajameesta" 8881;
diff --git a/modules/servers/microbin.nix b/modules/servers/microbin.nix
index 1cf86af..60d73cb 100644
--- a/modules/servers/microbin.nix
+++ b/modules/servers/microbin.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.microbin;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.microbin = setup.mkOptions "microbin" "copy" 8086;
diff --git a/modules/servers/multi-scrobbler.nix b/modules/servers/multi-scrobbler.nix
index 0bf642c..2acf691 100644
--- a/modules/servers/multi-scrobbler.nix
+++ b/modules/servers/multi-scrobbler.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.multi-scrobbler;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.multi-scrobbler = setup.mkOptions "multi-scrobbler" "scrobble" 9078;
diff --git a/modules/servers/nextcloud.nix b/modules/servers/nextcloud.nix
index 295cb4a..2eb5a53 100644
--- a/modules/servers/nextcloud.nix
+++ b/modules/servers/nextcloud.nix
@@ -31,7 +31,7 @@ let
   pytensorflow = pkgs.python311.withPackages (ps: [ ps.tensorflow ]);
   cfg = config.my.servers.nextcloud;
   cfgC = config.my.servers.collabora;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers = {
diff --git a/modules/servers/nix-serve.nix b/modules/servers/nix-serve.nix
index 17572ae..1489a75 100644
--- a/modules/servers/nix-serve.nix
+++ b/modules/servers/nix-serve.nix
@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.my.servers.nix-serve;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.nix-serve = setup.mkOptions "nix-serve" "cache" 5000;
diff --git a/modules/servers/ombi.nix b/modules/servers/ombi.nix
index eefb8e9..24c4beb 100644
--- a/modules/servers/ombi.nix
+++ b/modules/servers/ombi.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.ombi;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.ombi = setup.mkOptions "ombi" "requests" 3425;
diff --git a/modules/servers/plex-discord-bot.nix b/modules/servers/plex-discord-bot.nix
index 7469725..6ee478a 100644
--- a/modules/servers/plex-discord-bot.nix
+++ b/modules/servers/plex-discord-bot.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.plex-discord-bot;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
   name = "plex-discord-bot";
 in
 {
diff --git a/modules/servers/plex.nix b/modules/servers/plex.nix
index 82aea2c..0e805ea 100644
--- a/modules/servers/plex.nix
+++ b/modules/servers/plex.nix
@@ -5,7 +5,7 @@
 }:
 let
   cfg = config.my.servers.plex;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.plex = setup.mkOptions "plex" "plex" 32400;
diff --git a/modules/servers/portfolio.nix b/modules/servers/portfolio.nix
index 5783754..417be54 100644
--- a/modules/servers/portfolio.nix
+++ b/modules/servers/portfolio.nix
@@ -5,7 +5,7 @@
 }:
 let
   cfg = config.my.websites.portfolio;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.websites.portfolio = setup.mkOptions "portfolio" "portfolio" 0;
diff --git a/modules/servers/prowlarr.nix b/modules/servers/prowlarr.nix
index 0f41fbc..8474cd0 100644
--- a/modules/servers/prowlarr.nix
+++ b/modules/servers/prowlarr.nix
@@ -5,7 +5,7 @@
 }:
 let
   cfg = config.my.servers.prowlarr;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.prowlarr = setup.mkOptions "prowlarr" "indexer" 9696;
diff --git a/modules/servers/radarr.nix b/modules/servers/radarr.nix
index 9772bf6..2f3ace1 100644
--- a/modules/servers/radarr.nix
+++ b/modules/servers/radarr.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.radarr;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.radarr = setup.mkOptions "radarr" "movies" 7878;
diff --git a/modules/servers/readeck.nix b/modules/servers/readeck.nix
index 8e12e4f..1c7181b 100644
--- a/modules/servers/readeck.nix
+++ b/modules/servers/readeck.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.readeck;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.readeck = setup.mkOptions "readeck" "laters" 9546;
diff --git a/modules/servers/ryot.nix b/modules/servers/ryot.nix
index 6e59c13..a1e0c4c 100644
--- a/modules/servers/ryot.nix
+++ b/modules/servers/ryot.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.ryot;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.ryot = setup.mkOptions "ryot" "tracker" 8765;
diff --git a/modules/servers/shiori.nix b/modules/servers/shiori.nix
index 48fe919..2b8c09a 100644
--- a/modules/servers/shiori.nix
+++ b/modules/servers/shiori.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.shiori;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.shiori = setup.mkOptions "shiori" "bookmarks" 4368;
diff --git a/modules/servers/sonarr.nix b/modules/servers/sonarr.nix
index ec89171..d2a0920 100644
--- a/modules/servers/sonarr.nix
+++ b/modules/servers/sonarr.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.sonarr;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.sonarr = setup.mkOptions "sonarr" "series" 8989;
diff --git a/modules/servers/stash.nix b/modules/servers/stash.nix
index a314f61..ac4e804 100644
--- a/modules/servers/stash.nix
+++ b/modules/servers/stash.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.stash;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.stash = setup.mkOptions "stash" "xxx" 9999;
diff --git a/modules/servers/synapse.nix b/modules/servers/synapse.nix
index dea086a..32a7eaf 100644
--- a/modules/servers/synapse.nix
+++ b/modules/servers/synapse.nix
@@ -8,7 +8,7 @@ let
   cfg = config.my.servers.synapse;
   cfgE = config.my.servers.element;
   domain = "wedsgk5ac2qcaf9yb.click";
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
   clientConfig."m.homeserver".base_url = cfg.url;
   serverConfig."m.server" = "${cfg.host}:443";
   mkWellKnown = data: ''
diff --git a/modules/servers/tranga.nix b/modules/servers/tranga.nix
index fc8576a..db92c02 100644
--- a/modules/servers/tranga.nix
+++ b/modules/servers/tranga.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }:
 let
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
   cfg = config.my.servers.tranga;
 in
 {
diff --git a/modules/servers/vaultwarden.nix b/modules/servers/vaultwarden.nix
index 5b533fd..07fdbbc 100644
--- a/modules/servers/vaultwarden.nix
+++ b/modules/servers/vaultwarden.nix
@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.my.servers.vaultwarden;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.vaultwarden = setup.mkOptions "vaultwarden" "vault" 8222;