diff --git a/internal_packages/onboarding/lib/common-provider-settings.json b/internal_packages/onboarding/lib/common-provider-settings.json
index c4ef39e75..ca8a0177e 100644
--- a/internal_packages/onboarding/lib/common-provider-settings.json
+++ b/internal_packages/onboarding/lib/common-provider-settings.json
@@ -148,10 +148,10 @@
     "occurences": 129
   },
   "fastmail.com": {
-    "imap_host": "mail.messagingengine.com",
+    "imap_host": "imap.fastmail.com",
     "imap_port": "993",
-    "smtp_host": "mail.messagingengine.com",
-    "smtp_port": "587",
+    "smtp_host": "smtp.fastmail.com",
+    "smtp_port": "465",
     "smtp_user_format": "email",
     "imap_user_format": "email",
     "ssl": "1",