diff --git a/static/articles/grapheneos-servers.html b/static/articles/grapheneos-servers.html
index 24cd20c0..af51435e 100644
--- a/static/articles/grapheneos-servers.html
+++ b/static/articles/grapheneos-servers.html
@@ -114,17 +114,6 @@
                     <li>www.grapheneos.page</li>
                     <li>vanadium.app</li>
                     <li>www.vanadium.app</li>
-                    <li>mta-sts.grapheneos.org</li>
-                    <li>mta-sts.mail.grapheneos.org</li>
-                    <li>mta-sts.grapheneos.app</li>
-                    <li>mta-sts.grapheneos.ca</li>
-                    <li>mta-sts.grapheneos.com</li>
-                    <li>mta-sts.grapheneos.dev</li>
-                    <li>mta-sts.grapheneos.info</li>
-                    <li>mta-sts.grapheneos.net</li>
-                    <li>mta-sts.grapheneos.ovh</li>
-                    <li>mta-sts.grapheneos.page</li>
-                    <li>mta-sts.vanadium.app</li>
                 </ul>
 
                 <p>IPs:</p>
@@ -215,7 +204,6 @@
                     <li>releases.grapheneos.org</li>
                     <li>seamlessupdate.app</li>
                     <li>www.seamlessupdate.app</li>
-                    <li>mta-sts.seamlessupdate.app</li>
                     <li>apps.grapheneos.org</li>
                 </ul>
 
@@ -282,8 +270,6 @@
                     <li>connectivitycheck.grapheneos.online - HTTP/HTTPS connectivity checks</li>
                     <li>www.grapheneos.online</li>
                     <li>connectivitycheck.grapheneos.org (legacy) - HTTP/HTTPS connectivity checks</li>
-                    <li>mta-sts.grapheneos.network</li>
-                    <li>mta-sts.grapheneos.online</li>
                     <li>broadcom.psds.grapheneos.org - HTTPS Broadcom PSDS data cache</li>
                     <li>qualcomm.psds.grapheneos.org - HTTPS Qualcomm PSDS data cache</li>
                     <li>remoteprovisioning.grapheneos.org - HTTPS reverse proxy to remoteprovisioning.google.com</li>
@@ -336,6 +322,24 @@
 
                 <ul>
                     <li>mail.grapheneos.org</li>
+                    <li>mta-sts.mail.grapheneos.org</li>
+                    <li>mta-sts.attestation.app</li>
+                    <li>mta-sts.discuss.grapheneos.org</li>
+                    <li>mta-sts.grapheneos.app</li>
+                    <li>mta-sts.grapheneos.ca</li>
+                    <li>mta-sts.grapheneos.com</li>
+                    <li>mta-sts.grapheneos.dev</li>
+                    <li>mta-sts.grapheneos.info</li>
+                    <li>mta-sts.grapheneos.net</li>
+                    <li>mta-sts.grapheneos.network</li>
+                    <li>mta-sts.grapheneos.online</li>
+                    <li>mta-sts.grapheneos.org</li>
+                    <li>mta-sts.grapheneos.ovh</li>
+                    <li>mta-sts.grapheneos.page</li>
+                    <li>mta-sts.grapheneos.social</li>
+                    <li>mta-sts.matrix.grapheneos.org</li>
+                    <li>mta-sts.seamlessupdate.app</li>
+                    <li>mta-sts.vanadium.app</li>
                 </ul>
 
                 <p>IPs:</p>
@@ -600,7 +604,6 @@
                 <ul>
                     <li>attestation.app</li>
                     <li>www.attestation.app</li>
-                    <li>mta-sts.attestation.app</li>
                 </ul>
 
                 <p>IPs:</p>