diff --git a/hosts/mail/mail.nix b/hosts/mail/mail.nix
index b608ada..84aa2fb 100644
--- a/hosts/mail/mail.nix
+++ b/hosts/mail/mail.nix
@@ -5,18 +5,21 @@
 }:
 
 let
-  domains = [
-    "h0lt.com"
+  sendingDomains = [
     "jdholt.com"
+    "vimium.com"
+  ];
+  receiveOnlyDomains = [
+    "h0lt.com"
     "jordanholt.xyz"
     "vimium.co"
-    "vimium.com"
     "vimium.co.uk"
     "vimium.info"
     "vimium.net"
     "vimium.org"
     "vimium.xyz"
   ];
+  allDomains = sendingDomains ++ receiveOnlyDomains;
 in
 {
   imports = [
@@ -50,7 +53,7 @@ in
   mailserver = {
     enable = true;
     fqdn = "mail.vimium.com";
-    domains = domains;
+    domains = allDomains;
     indexDir = "/var/lib/dovecot/indices";
 
     certificateDomains = [
@@ -64,16 +67,10 @@ in
     loginAccounts = {
       "jordan@vimium.com" = {
         hashedPasswordFile = config.age.secrets."passwords/users/jordan".path;
-        catchAll = domains;
+        aliases = map (domain: "@" + domain) sendingDomains;
+        catchAll = receiveOnlyDomains;
       };
     };
-
-    extraVirtualAliases = {
-      "hostmaster@vimium.com" = "jordan@vimium.com";
-      "postmaster@vimium.com" = "jordan@vimium.com";
-      "webmaster@vimium.com" = "jordan@vimium.com";
-      "abuse@vimium.com" = "jordan@vimium.com";
-    };
   };
 
   services.postfix.config = {