diff --git a/_config.yml b/_config.yml
index 40a3cf1a..5c11ba8c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -136,9 +136,12 @@ analytics:
 # Site Footer
 footer:
   links:
-    - label: "Twitter"
+    - label: "@spackpm"
       icon: "fab fa-brands fa-x-twitter"
-      url: https://x.com/spackpm
+      url: "https://x.com/spackpm"
+    - label: "@spack"
+      icon: "fab fa-brands fa-mastodon"
+      url: "https://mast.hpc.social/@spack"
     - label: "GitHub"
       icon: "fab fa-fw fa-github"
       url: https://github.com/spack/spack
@@ -152,8 +155,8 @@ footer:
       icon: "fas fa-book"
       url: https://spack.readthedocs.io/
     - label: "Discussion"
-      icon: "fab fa-google"
-      url: "https://groups.google.com/d/forum/spack"
+      icon: "fas fa-comments"
+      url: "https://github.com/spack/spack/discussions"
     - label: "maintainers"
       icon: "far fa-envelope"
       url: "mailto:maintainers@spack.io"
diff --git a/_data/authors.yml b/_data/authors.yml
index 858cd3d7..02be1294 100644
--- a/_data/authors.yml
+++ b/_data/authors.yml
@@ -10,8 +10,11 @@ Todd Gamblin:
       icon: "fas fa-fw fa-link"
       url: "https://people.llnl.gov/gamblin2"
     - label: "@tgamblin"
-      icon: "fab fa-fw fa-twitter-square"
-      url: "https://twitter.com/tgamblin"
+      icon: "fab fa-brands fa-x-twitter"
+      url: "https://x.com/tgamblin"
+    - label: "@tgamblin@hachyderm.io"
+      icon: "fab fa-brands fa-mastodon"
+      url: "https://hachyderm.io/@tgamblin"
     - label: "GitHub"
       icon: "fab fa-fw fa-github"
       url: "https://github.com/tgamblin"
diff --git a/index.html b/index.html
index a10c637f..a8ff5eca 100644
--- a/index.html
+++ b/index.html
@@ -10,16 +10,16 @@
   actions:
   - label: "<i class=\"fab fa-fw fa-github\"></i> GitHub"
     url: "https://github.com/spack/spack"
-  - label: "<i class=\"fab fa-fw fa-twitter\"></i> Twitter"
-    url: "https://twitter.com/spackpm"
+  - label: "<i class=\"fab fa-brands fa-x-twitter\"></i> @spackpm"
+    url: "https://x.com/spackpm"
+  - label: "<i class=\"fab fa-brands fa-mastodon\"></i> @spack"
+    url: "https://mast.hpc.social/@spack"
   - label: "<i class=\"fab fa-slack\"></i> Slack"
     url: "https://slack.spack.io"
-  - label: "<i class=\"fa fa-comments\"></i> Matrix"
-    url: "https://matrix.to/#/#spack-space:matrix.org"
   - label: "<i class=\"fas fa-book\"></i> Docs"
     url: "https://spack.readthedocs.io/"
-  - label: "<i class=\"fab fa-google\"></i> Discussion"
-    url: "https://groups.google.com/d/forum/spack"
+  - label: "<i class=\"fas fa-comments\"></i> Discussion"
+    url: "https://github.com/spack/spack/discussions"
 ---
 
 {% capture markdown %}