diff --git a/flake.lock b/flake.lock
index 341a815..3f93525 100644
--- a/flake.lock
+++ b/flake.lock
@@ -740,11 +740,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777743346,
-        "narHash": "sha256-gJ0aOSvmr1g06oSKGNDlIvfex7BVVxyP3txQ9gg2fdQ=",
+        "lastModified": 1779934676,
+        "narHash": "sha256-wp/K//HuAPN0TureyV342zjoee+vSq64+guX35X7DMU=",
         "owner": "genebean",
         "repo": "private-flake",
-        "rev": "8a0c1d3cf8a4eee614ac8c665dce70794de5f973",
+        "rev": "7ad20ffceb1b6e48af13b2207241441a2cafa97e",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index dd34b2c..4caf4ae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -180,7 +180,6 @@
           additionalModules = [
             inputs.cup-collector.nixosModules.default
             inputs.private-flake.nixosModules.private.nixnuc
-            inputs.simple-nixos-mailserver.nixosModule
           ];
         };
         # This machines is currently running Ubuntu and
diff --git a/modules/hosts/nixos/nixnuc/default.nix b/modules/hosts/nixos/nixnuc/default.nix
index dc6b924..abf7108 100644
--- a/modules/hosts/nixos/nixnuc/default.nix
+++ b/modules/hosts/nixos/nixnuc/default.nix
@@ -68,25 +68,6 @@ in
     ];
   };
 
-  mailserver = {
-    enable = true;
-    enableImap = false;
-    enableImapSsl = false;
-    fqdn = "mail.${home_domain}";
-    domains = [
-      home_domain
-    ];
-    forwards = {
-      "${username}@localhost" = "${username}@technicalissues.us";
-      "root@localhost" = "root@technicalissues.us";
-      "root@${config.networking.hostName}" = "root@technicalissues.us";
-    };
-    stateVersion = 3;
-
-    # Use Let's Encrypt certificates from Nginx
-    certificateScheme = "acme";
-  };
-
   networking = {
     # Open ports in the firewall.
     firewall = {
@@ -326,7 +307,6 @@ in
         "${home_domain}" = {
           default = true;
           serverAliases = [
-            "mail.${home_domain}"
             "nix-tester.${home_domain}"
           ];
           listen = [