diff --git a/nixos/network.nix b/nixos/network.nix
index 6562abef..79c65a97 100644
--- a/nixos/network.nix
+++ b/nixos/network.nix
@@ -175,7 +175,7 @@
             type = nullOr str;
             default = "kittywit.ch.";
           };
-          domain_dotless = mkOption {
+          uqdn = mkOption {
             type = nullOr str;
             default = lib.removeSuffix "." config.target;
           };
diff --git a/services/mail/dovecot.nix b/services/mail/dovecot.nix
index 7972140e..b15ecf90 100644
--- a/services/mail/dovecot.nix
+++ b/services/mail/dovecot.nix
@@ -95,7 +95,7 @@ in
       }
       protocol lmtp {
         postmaster_address=postmaster@kittywit.ch
-        hostname=${config.networks.internet.domain_dotless}
+        hostname=${config.networks.internet.uqdn}
         mail_plugins = $mail_plugins sieve
       }
       service auth {
diff --git a/services/mail/postfix.nix b/services/mail/postfix.nix
index 7ba9421b..20680d95 100644
--- a/services/mail/postfix.nix
+++ b/services/mail/postfix.nix
@@ -3,7 +3,7 @@
 let
   publicCert = "daiyousei.kittywit.ch";
 
-  ldaps = "ldaps://auth.${config.networks.internet.domain_dotless}:636";
+  ldaps = "ldaps://auth.${config.networks.internet.uqdn}:636";
 
   virtualRegex = pkgs.writeText "virtual-regex" ''
     /^kat\.[^@.]+@kittywit\.ch$/ kat@kittywit.ch
@@ -90,7 +90,7 @@ in {
   services.postfix = {
     enable = true;
     enableSubmission = true;
-    hostname = config.networks.internet.domain_dotless;
+    hostname = config.networks.internet.uqdn;
     domain = "kittywit.ch";
 
     masterConfig."465" = {
diff --git a/services/mail/sogo.nix b/services/mail/sogo.nix
index bef4c7e7..ccf54c91 100644
--- a/services/mail/sogo.nix
+++ b/services/mail/sogo.nix
@@ -46,8 +46,8 @@
       SOGoMailingMechanism = "smtp";
       SOGoForceExternalLoginWithEmail = YES;
       SOGoSMTPAuthenticationType = PLAIN;
-      SOGoSMTPServer = "smtps://${config.networks.internet.domain_dotless}:465";
-      SOGoIMAPServer = "imaps://${config.networks.internet.domain_dotless}:993";
+      SOGoSMTPServer = "smtps://${config.networks.internet.uqdn}:465";
+      SOGoIMAPServer = "imaps://${config.networks.internet.uqdn}:993";
       SOGoUserSources = (
           {
               type = ldap;