diff --git a/lib/data/data.json b/lib/data/data.json
index 0500dee..4ad01de 100644
--- a/lib/data/data.json
+++ b/lib/data/data.json
@@ -126,10 +126,6 @@
       "on": "fra1",
       "proxy": false
     },
-    "mail": {
-      "on": "fra1",
-      "proxy": false
-    },
     "minio": {
       "on": "fra1",
       "proxy": false
diff --git a/nixos/modules/services/doraim.nix b/nixos/modules/services/doraim.nix
index cc821d3..b80c35c 100644
--- a/nixos/modules/services/doraim.nix
+++ b/nixos/modules/services/doraim.nix
@@ -50,14 +50,14 @@
             <displayName>Doraemon Mail</displayName>
             <displayShortName>Doraemon</displayShortName>
             <incomingServer type="imap">
-              <hostname>mail.dora.im</hostname>
+              <hostname>glacier.mxrouting.net</hostname>
               <port>993</port>
               <socketType>SSL</socketType>
               <authentication>password-cleartext</authentication>
               <username>%EMAILADDRESS%</username>
             </incomingServer>
             <outgoingServer type="smtp">
-              <hostname>mail.dora.im</hostname>
+              <hostname>glacier.mxrouting.net</hostname>
               <port>465</port>
               <socketType>SSL</socketType>
               <authentication>password-cleartext</authentication>
@@ -71,6 +71,7 @@
       version: STSv1
       mode: enforce
       mx: *.dora.im
+      mx: *.mxrouting.net
       max_age: 86400
     '';
   };
diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
index 858f3a9..ebba2e3 100644
--- a/terraform/.terraform.lock.hcl
+++ b/terraform/.terraform.lock.hcl
@@ -2,32 +2,33 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/aminueza/minio" {
-  version = "2.5.0"
+  version = "3.2.1"
   hashes = [
-    "h1:RrjfsRy+fBVh7VF3r9u7uCCSjAdR5APa6sqbc9b8GfU=",
-    "zh:066cdb289dbfd1675e22fe58c8b42e2732f24fc1528b1919a78dfe28f80e8b30",
-    "zh:26d5e55106259e69493b95058178ec3d6b2395f03a8fe832af1be0e4d89ef42c",
-    "zh:6247e19de9ec6ef719cfcb174b8f08085c0fd5118b3b0de3fb9bb150702b4ad8",
-    "zh:70c3cbab0ba8edeec0db2e175bcdb47255c92f3153f839c4e8f2b0fe8c1366f4",
-    "zh:713793b4b93ae62070b18983ff525390de6c84547cab4220aa068437149f5035",
-    "zh:72de3e532d4bc7c7a4a872aaf00d7e4dfa09f3730668a738bb881d6734248f02",
-    "zh:9090f9288d7bc9f23043c1e65d8535e91f10413a16699d4a18add811b25fa167",
-    "zh:9847284aecb52718468feccb914d67e8befb8bff8345275cb03c3209b338f68b",
-    "zh:aa09ba1aa6fec278198ff352cc7f2977cfe567d31fd948c54fba5db82b4cd7ec",
-    "zh:ca28efbf60400918b9dadd18ecbf683065bf9329b35cbf3826718d8d50f10263",
-    "zh:cb21b119202ac6a30724beb89aefbb8660762b0e9b7165f1e22d59720dd0f110",
-    "zh:f36b4c9fe4795e892b3be2c80a22461f373541f81d335b51afa963097ab29624",
+    "h1:KUaNvQb0tv8ZjmVbuagYPVSwVfBaUfsPmYPRuk3T/fA=",
+    "zh:397dbcbce5c1b80dbb1f946b706173cac3520d7af7dc82419c2cc7a518310754",
+    "zh:46654ad40858fee3c761e3edafba2c9750f3c95651451b80662cf1970926726e",
+    "zh:48e94f32e0efc9ff3bd7c75fd6e9e274c15da1cdb49f6420e5928dd29eb8183d",
+    "zh:49ec481963fe02260a6860e0049f0902528a6e0b5041fed548d543992c44fbc8",
+    "zh:4f9f7646f6bcb32cb5b7d7bbf2820c392789960a20a9ee8ca24b4d7488076db1",
+    "zh:7b23a4570aceb70b985a02fe495991f1164e2248fb14c868f29a968c56e22d49",
+    "zh:7f90b9894eb925a8c41caa36935c6627ca28b13162cfdcd0a101b0c993cabb37",
+    "zh:e810fe4f333e31a4ded99efe14a7456723deb31622809ce89eecc159be0dd781",
+    "zh:e8c72e21b4c165b4ce545fdc219e79d47d62e36c3a664b3b0917657525899551",
+    "zh:f2b44f569f4f406fbf400c0f44e7bb92285f069214152ac0ea72beea58c2921c",
+    "zh:f5cea25dfe849279c60c385cc31f197aacd7c43e4cdfd19248593dd23bec508e",
+    "zh:f9059596afd0a1c843c4d64bb3e44f44fc9616f5abbb96d8a3445991cb992e45",
   ]
 }
 
 provider "registry.terraform.io/backblaze/b2" {
-  version = "0.8.12"
+  version = "0.9.0"
   hashes = [
-    "h1:rA+Y9HyJGPV7kU52+9vKRM90RiGjdwj9Tas5ZImfsw0=",
-    "zh:bc9d25d21adeafba8edde8d6ffb6150cd5c86c207412c8941347966be3363de5",
-    "zh:c538eaea1b15379635b9d8a2cb862248813022bb0de5481741f18fcc77a10a1b",
-    "zh:cc2767797ad27b9a3b4ad97b6a2f3eeea9f50a6000bbcfa9b44189945dae30b3",
-    "zh:d83b5f0e632ea56570a0737c1896f049367201cc67f5de83baa24272ccdd56a4",
+    "h1:kJQqBhM6NQn2Ksd0QSeCQTNSx3R1XoFkKP7jStsKjow=",
+    "zh:07619330ef01d26946465f2c81fb91ad5a206c0cc990ba80509cdb5035f1dec4",
+    "zh:610e9bc95581a166614eb91b1e92debef829a6a29c3a868a24f8df6a80eb8051",
+    "zh:62920a6b287a8967785f5bc74c094bc5ef97073ae5ef7745d9b7e39fbecae45a",
+    "zh:67396c26433016b7ad3c4cbb149148b34c6f5ddd2c9656b92f7a9541a2707657",
+    "zh:7bca40abd15b07bade2a37644e7721274ed0d192c7af650c9af038b7dca9947d",
   ]
 }
 
@@ -65,24 +66,24 @@ provider "registry.terraform.io/carlpett/sops" {
 }
 
 provider "registry.terraform.io/cloudflare/cloudflare" {
-  version = "4.41.0"
+  version = "4.47.0"
   hashes = [
-    "h1:YxQqmiES/Yanq/VfGqBEqg+VIO7FGhO88aKoWFHyGIg=",
-    "zh:339d26e06dc6fb299ea8aad9476a60fd65bb1d40631ae8eeb81cddf2dd2bebc8",
-    "zh:3dec2ad96ac2c283fd34ce65781b55c4edbb4d5c5cb53da8e31537176c0ed562",
-    "zh:5f63a5f8080319a2fff09d4d49944829fa708723436520787cfb60725ced80cf",
-    "zh:67162c28ccea71cb8141ed15c0637e35621354ebe14878e0b75a8f160fc5505d",
-    "zh:6ac1e07f5347b6395aca690ed22101bb25e957d25f986f760ff673a7adfd5ef6",
-    "zh:70282a723c7b52fcabde2baad41c864ed3a8d69f0c4d27a6b6933cac434cffc6",
+    "h1:jRNDuRaXbNFMLQZ298HoXodPUqI+4VVl8xgsCKAg5Yg=",
+    "zh:1df6a36bad08e95518987a15584e535a1dad5fa0ee6e067c0c39d709a285f6b9",
+    "zh:20dce2a63f24f571f4d52d3217811d71e8d21f149f751d5972ec19200674638a",
+    "zh:6571aeeb61d4a27b4210a1979028119a1905e162b0c3845e7b549d6e0a08c36d",
+    "zh:87ec7ebe65c8884e174999c22970e2f28b0da4e0f65bdc92db051eb3dd649f78",
     "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:924cd23abc326c6b3914e2cd9c94c7832c2552e1e9ae258fb9fd9aedaa5f7ce7",
-    "zh:a4b75e4c239879296259e7d54f1befbc7fdc16da2d62d1294e9f73add4cae61e",
-    "zh:a6ceb08feb63b00c7141783b31e45a154c76fd8cdebbdf371074805f0053572d",
-    "zh:afae1843f9ba85f2f6d94108c65cf43a457e83531a632d44d863e935160cb2ba",
-    "zh:bd6628ce60c778960a5755f7010b7e2cc5c6ff0341a21c175341b28058ec843d",
-    "zh:cd30866a1ff99d72b5fa1699db582fa4f25562e6ab21dcc6870324f3056108e0",
-    "zh:df5924cca691a8220aaaebb5cb55c3d6c32ff0a881f198695eff28155eb12b54",
-    "zh:e78d0696c941aba58df1cb36b8a0d25cd5f3963f01d9338fdbda74db58afdd49",
+    "zh:a20d1c0865a9443ada90ab7c83bd8605024452cf1e9f3b2ed2efcf06221b7835",
+    "zh:a5a5a91f658029ae3bb0414643ca09bd6a98a1980e197a9eb2ea4ba96a190d88",
+    "zh:b12623a85840821c465b87b1d65542f8f4a77079afef0ad2cc102a9f6eb4045c",
+    "zh:b83ac4f0b81aee32b3670f5870245172741bb86b153623da687d3c45ec9c1af9",
+    "zh:bb1ad4fcb949b12e5b40a21e65963ff64e20e72ab4c87a3ec91306b440a2cf35",
+    "zh:cb5a8bc24444a9d8f536b5acb7f6346f12c03e23539b183cb370f4876992360f",
+    "zh:ce6cc02ac4fc8cdf48a64254fdb0ea859b5b48e7fc08c7f1fcb8e9364ed32434",
+    "zh:e44643c86d38799991f5eb2378c00ca4738ec0f21dd64536dadffd71a337d778",
+    "zh:e5024d6792fcaa974b5f294399eea9b9c7d3d5d228423e71941994858a20c58f",
+    "zh:f9b18d0443487e30e0f3b83e311f17c85d184dc9f55b3f9b31332e815c41745a",
   ]
 }
 
diff --git a/terraform/cloudflare.tf b/terraform/cloudflare.tf
index 7cca488..0b18b1a 100644
--- a/terraform/cloudflare.tf
+++ b/terraform/cloudflare.tf
@@ -79,7 +79,6 @@ locals {
     mta-sts            = { on = "fra1", proxy = false }
     atuin              = { on = "fra1", proxy = false }
     ntfy               = { on = "fra1", proxy = false }
-    mail               = { on = "fra1", proxy = false }
     pb                 = { on = "fra1", proxy = false }
     ollama             = { on = "fra1", proxy = false }
     ollama-ui          = { on = "fra1", proxy = false }
@@ -149,12 +148,20 @@ resource "cloudflare_record" "_matrix_tcp" {
 
 # mail
 
+resource "cloudflare_record" "mail" {
+  name    = "mail"
+  proxied = false
+  ttl     = 1
+  type    = "CNAME"
+  content = "glacier.mxrouting.net"
+  zone_id = cloudflare_zone.im_dora.id
+}
 resource "cloudflare_record" "dora_dkim" {
-  name    = "default._domainkey"
+  name    = "x._domainkey"
   proxied = false
   ttl     = 1
   type    = "TXT"
-  content = "v=DKIM1; h=sha256; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzuafKXbacHeSP/2YgMN9YntpX3e5OhU+48qRliq3HDiQu6yDoEF7jVrXsK6MPgFggv7qRG+DdGGAn6Ucwjb89RESnFSujLsrhyZO6GhGcuF8brp/VSJxSBTrdoz1IQQtBjSWjREeT1wITP7Pktol4jMvXc//FBBcSKJ85aNWxLfT3L+lJII+hAPShlaB8AsUGnu2I/l1ec6/Eet5RSqI2jnmsx2qKxGOhyc0FfrYZFdnSRDDxUNvbNZuTM8nGTmDm1YWLFBHr8Ugjju4cyXFm61ifDpXcFRed2Bb6tEW8m8a1tLkpQySF1REPvtgk0YCZ+2CbHZSQA5V0X1VfjEA2QIDAQAB"
+  content = "v=DKIM1;k=rsa;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnsLpb6J3ymivQlMqzN4oKAxPNYWNpRvD8uM1e4lWlgl+jYl2lDEzB5nIewbH9HnQ6aWi0HVgku6jqllOR2Fqspc/DkSERA1gPeqfelP3V5+ligKNU8PG26G8X+9ibR11oG9Iz1bEXBJ6ws4aSADl+e5uCS3jzJydPxJEdYERXVQA0CiSi3FK3BWlUD3dxmE80qZwYW+pxqobO4gyozow8/C8sz19zy5igJLdM5TfhTaOC1mXxL33tSJwAPlpp8homAmMX0uecIVv/JUxs4ucgu6swMjYRSeuruq1e6APTi+f+0wvnZNEegB5xTvm7IcQ0z75wA+Uw6VE/4iFuov3lQIDAQAB"
   zone_id = cloudflare_zone.im_dora.id
 }
 
@@ -172,7 +179,7 @@ resource "cloudflare_record" "dora_spf" {
   proxied = false
   ttl     = 1
   type    = "TXT"
-  content = "v=spf1 mx mx:dora.im -all"
+  content = "v=spf1 include:mxlogin.com -all"
   zone_id = cloudflare_zone.im_dora.id
 }
 
@@ -181,17 +188,25 @@ resource "cloudflare_record" "dora_mta_sts" {
   proxied = false
   ttl     = 1
   type    = "TXT"
-  content = "v=STSv1; id=2022621T010102"
+  content = "v=STSv1; id=20241201T010102"
   zone_id = cloudflare_zone.im_dora.id
 }
-
-resource "cloudflare_record" "dora_mx_fra1" {
+resource "cloudflare_record" "dora_mx_mxroute1" {
+  name     = "dora.im"
+  proxied  = false
+  ttl      = 1
+  type     = "MX"
+  content  = "glacier.mxrouting.net"
+  priority = 10
+  zone_id  = cloudflare_zone.im_dora.id
+}
+resource "cloudflare_record" "dora_mx_mxroute2" {
   name     = "dora.im"
   proxied  = false
   ttl      = 1
   type     = "MX"
-  content  = "fra1.dora.im"
-  priority = 1
+  content  = "glacier-relay.mxrouting.net"
+  priority = 20
   zone_id  = cloudflare_zone.im_dora.id
 }