diff --git a/config/modules/nixos/dns.nix b/config/modules/nixos/dns.nix
index 68698691..d4f561e7 100644
--- a/config/modules/nixos/dns.nix
+++ b/config/modules/nixos/dns.nix
@@ -38,9 +38,9 @@ with lib;
 
   config = {
     # Set these.
-    kw.dns.email = "kat@kittywit.ch";
-    kw.dns.tld = "kittywit.ch.";
-    kw.dns.ygg_prefix = "net";
+    kw.dns.email = mkDefault "kat@kittywit.ch";
+    kw.dns.tld = mkDefault "kittywit.ch.";
+    kw.dns.ygg_prefix = mkDefault "net";
 
     # This should be set in host config if it needs to be set for a host. Otherwise, they're retrieved from terraform.
     kw.dns.ipv4 = mkDefault (mkIf (tf.resources ? config.networking.hostName) (mkOptionDefault (config.deploy.tf.resources."${config.networking.hostName}".refAttr "ipv4_address")));
diff --git a/config/services/filehost/default.nix b/config/services/filehost/default.nix
index d13e245f..4aac8232 100644
--- a/config/services/filehost/default.nix
+++ b/config/services/filehost/default.nix
@@ -2,7 +2,7 @@
 
 {
   services.nginx.virtualHosts = {
-    "files.kittywit.ch" = {
+    "files.${config.kw.dns.domain}" = {
       root = "/var/www/files";
       enableACME = true;
       forceSSL = true;
diff --git a/wiki b/wiki
index cda4f1d9..89ebb8c1 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit cda4f1d9cb996f528ad5d2395abef1d6ed6bbc46
+Subproject commit 89ebb8c1ed4ab1f03239a5fbc81b96adb419f6a6