diff --git a/hosts/disk/mail/default.nix b/hosts/disk/mail/default.nix
index 1f0d5c2..6c0151c 100644
--- a/hosts/disk/mail/default.nix
+++ b/hosts/disk/mail/default.nix
@@ -28,7 +28,7 @@ in systemConfiguration {
   };
 
   mailserver = enabled {
-    inherit domain fqdn;
+    inherit fqdn;
 
     domains           = [ domain ];
     certificateScheme = "acme";
diff --git a/modules/git.nix b/modules/git.nix
index 6fc7329..764cce3 100644
--- a/modules/git.nix
+++ b/modules/git.nix
@@ -66,7 +66,7 @@
 
 (let
   gitDomain  = self.cube.services.forgejo.fqdn;
-  mailDomain = self.disk.mailserver.domain;
+  mailDomain = head self.disk.mailserver.domains;
 in homeConfiguration {
   programs.nushell.configFile.text = mkAfter ''
     # Sets the remote origin to the specified user and repository on my git instance
diff --git a/options/domains.nix b/options/domains.nix
index ebd571d..076ba91 100644
--- a/options/domains.nix
+++ b/options/domains.nix
@@ -1,7 +1,3 @@
 { lib, ... }: {
-  options = {
-    mailserver.domain = lib.mkValue null;
-
-    services.forgejo.fqdn = lib.mkValue null;
-  };
+  options.services.forgejo.fqdn = lib.mkValue null;
 }