diff --git a/hosts/VEGAS/services/mail/default.nix b/cluster/services/mail/certificate.nix
similarity index 78%
rename from hosts/VEGAS/services/mail/default.nix
rename to cluster/services/mail/certificate.nix
index 57c5cac..077ad5e 100644
--- a/hosts/VEGAS/services/mail/default.nix
+++ b/cluster/services/mail/certificate.nix
@@ -1,11 +1,6 @@
 { depot, lib, ... }:
-{
-  imports = [
-    ./imap.nix
-    ./opendkim.nix
-    ./postfix.nix
-  ];
 
+{
   security.acme.certs."mail.${depot.lib.meta.domain}" = {
     dnsProvider = "exec";
     webroot = lib.mkForce null;
diff --git a/cluster/services/mail/default.nix b/cluster/services/mail/default.nix
index f271d54..1d22001 100644
--- a/cluster/services/mail/default.nix
+++ b/cluster/services/mail/default.nix
@@ -1,6 +1,24 @@
 { depot, ... }:
 
 {
+  services.mail = {
+    nodes = {
+      smtp = [ "VEGAS" ];
+      imap = [ "VEGAS" ];
+    };
+    nixos = {
+      smtp = [
+        ./postfix.nix
+        ./opendkim.nix
+        ./certificate.nix
+      ];
+      imap = [
+        ./imap.nix
+        ./certificate.nix
+      ];
+    };
+  };
+
   dns.records = let
     inherit (depot.lib.meta) domain adminEmail;
     mailServerAddr = depot.hours.VEGAS.interfaces.primary.addrPublic;
diff --git a/hosts/VEGAS/services/mail/generic-aliases b/cluster/services/mail/generic-aliases
similarity index 100%
rename from hosts/VEGAS/services/mail/generic-aliases
rename to cluster/services/mail/generic-aliases
diff --git a/hosts/VEGAS/services/mail/imap.nix b/cluster/services/mail/imap.nix
similarity index 96%
rename from hosts/VEGAS/services/mail/imap.nix
rename to cluster/services/mail/imap.nix
index 0467173..6c66309 100644
--- a/hosts/VEGAS/services/mail/imap.nix
+++ b/cluster/services/mail/imap.nix
@@ -32,7 +32,7 @@ let
   '';
 in {
 
-  age.secrets.dovecotLdapToken.file = ../../../../secrets/dovecot-ldap-token.age;
+  age.secrets.dovecotLdapToken.file = ../../../secrets/dovecot-ldap-token.age;
 
   networking.firewall.allowedTCPPorts = [ 143 993 ];
 
diff --git a/hosts/VEGAS/services/mail/known-spam-domains b/cluster/services/mail/known-spam-domains
similarity index 100%
rename from hosts/VEGAS/services/mail/known-spam-domains
rename to cluster/services/mail/known-spam-domains
diff --git a/hosts/VEGAS/services/mail/opendkim.nix b/cluster/services/mail/opendkim.nix
similarity index 100%
rename from hosts/VEGAS/services/mail/opendkim.nix
rename to cluster/services/mail/opendkim.nix
diff --git a/hosts/VEGAS/services/mail/postfix.nix b/cluster/services/mail/postfix.nix
similarity index 98%
rename from hosts/VEGAS/services/mail/postfix.nix
rename to cluster/services/mail/postfix.nix
index c605657..a7c8604 100644
--- a/hosts/VEGAS/services/mail/postfix.nix
+++ b/cluster/services/mail/postfix.nix
@@ -14,7 +14,7 @@ let
 in
 {
   age.secrets."postfix-ldap-mailboxes.cf" = {
-    file = ../../../../secrets/postfix-ldap-mailboxes.age;
+    file = ../../../secrets/postfix-ldap-mailboxes.age;
     owner = "postfix";
     group = "postfix";
     mode = "0400";
diff --git a/hosts/VEGAS/services/mail/sieve/plus.sieve b/cluster/services/mail/sieve/plus.sieve
similarity index 100%
rename from hosts/VEGAS/services/mail/sieve/plus.sieve
rename to cluster/services/mail/sieve/plus.sieve
diff --git a/hosts/VEGAS/services/mail/virtual-mail-domain-aliases b/cluster/services/mail/virtual-mail-domain-aliases
similarity index 100%
rename from hosts/VEGAS/services/mail/virtual-mail-domain-aliases
rename to cluster/services/mail/virtual-mail-domain-aliases
diff --git a/hosts/VEGAS/system.nix b/hosts/VEGAS/system.nix
index bcce2f3..8755edf 100644
--- a/hosts/VEGAS/system.nix
+++ b/hosts/VEGAS/system.nix
@@ -18,7 +18,6 @@
       ./services/backbone-routing
       ./services/cdn-shield
       ./services/jokes
-      ./services/mail
       ./services/minecraft
       ./services/websites
       ./services/wireguard-server