diff --git a/teams/alumni.toml b/teams/alumni.toml
index 64191e392..53b0924ba 100644
--- a/teams/alumni.toml
+++ b/teams/alumni.toml
@@ -6,26 +6,11 @@ name = "alumni"
 [people]
 leads = []
 members = [
-    "Aatch",
-    "MajorBreakfast",
-    "QuietMisdreavus",
-    "TimNN",
     "alercah",
-    "arielb1",
     "birkenfeld",
-    "bkoropoff",
-    "booyaa",
-    "edunham",
-    "erickt",
-    "frewsxcv",
     "gnunicorn",
-    "jseyfried",
-    "levex",
-    "niconii",
-    "pcwalton",
     "peschkaj",
     "rpjohnst",
-    "tomprince",
     "valgrimm",
     "whitequark",
 ]
diff --git a/teams/archive/devtools-peers.toml b/teams/archive/devtools-peers.toml
new file mode 100644
index 000000000..2e984e6c4
--- /dev/null
+++ b/teams/archive/devtools-peers.toml
@@ -0,0 +1,13 @@
+name = "devtools-peers"
+
+[people]
+leads = []
+members = []
+alumni = [
+    "QuietMisdreavus",
+]
+
+[website]
+page = "dev-tools"
+name = "Dev tools peers"
+description = "Oversight of specific Rust tools, and coordination with devtools team"
diff --git a/teams/archive/docs.toml b/teams/archive/docs.toml
index e245e6178..c4ce0047d 100644
--- a/teams/archive/docs.toml
+++ b/teams/archive/docs.toml
@@ -4,6 +4,8 @@ name = "docs"
 leads = []
 members = []
 alumni = [
+    "QuietMisdreavus",
+    "frewsxcv",
     "steveklabnik",
     "GuillaumeGomez",
     "rylev",
diff --git a/teams/community.toml b/teams/community.toml
index 8e424f118..bd0ff319f 100644
--- a/teams/community.toml
+++ b/teams/community.toml
@@ -11,6 +11,9 @@ members = [
     "nellshamrell",
 ]
 alumni = [
+    "booyaa",
+    "edunham",
+    "erickt",
     "brson",
     "shadows-withal",
     "ashleygwilliams",
diff --git a/teams/compiler.toml b/teams/compiler.toml
index e92b60789..e84ef6711 100644
--- a/teams/compiler.toml
+++ b/teams/compiler.toml
@@ -20,8 +20,12 @@ members = [
     "jackh726",
 ]
 alumni = [
+    "Aatch",
+    "arielb1",
+    "bkoropoff",
     "cramertj",
     "dotdash",
+    "jseyfried",
     "nikomatsakis",
     "nrc",
     "varkor",
diff --git a/teams/core.toml b/teams/core.toml
index c7f9ed4e2..92a20968b 100644
--- a/teams/core.toml
+++ b/teams/core.toml
@@ -14,7 +14,9 @@ alumni = [
     "alexcrichton",
     "aturon",
     "brson",
+    "erickt",
     "huonw",
+    "pcwalton",
     "nrc",
     "carols10cents",
     "nikomatsakis",
diff --git a/teams/docs-rs.toml b/teams/docs-rs.toml
index ac9c30873..2b0870941 100644
--- a/teams/docs-rs.toml
+++ b/teams/docs-rs.toml
@@ -15,6 +15,7 @@ alumni = [
     "onur",
     "pietroalbini",
     "jyn514",
+    "QuietMisdreavus",
 ]
 
 [[github]]
diff --git a/teams/infra.toml b/teams/infra.toml
index 66cdca78d..31627b599 100644
--- a/teams/infra.toml
+++ b/teams/infra.toml
@@ -20,6 +20,10 @@ alumni = [
     "ashleygwilliams",
     "aidanhs",
     "jyn514",
+    "TimNN",
+    "erickt",
+    "frewsxcv",
+    "tomprince",
 ]
 
 [[github]]
diff --git a/teams/mods.toml b/teams/mods.toml
index 5a0f540a8..042e958e1 100644
--- a/teams/mods.toml
+++ b/teams/mods.toml
@@ -7,6 +7,8 @@ members = [
     "oli-obk",
 ]
 alumni = [
+    "erickt",
+    "niconii",
     "BurntSushi",
     "llogiq",
     "matthieu-m",
diff --git a/teams/rustdoc.toml b/teams/rustdoc.toml
index 0d4726d2b..cc08ff11c 100644
--- a/teams/rustdoc.toml
+++ b/teams/rustdoc.toml
@@ -17,6 +17,7 @@ alumni = [
     "kinnison",
     "ollie27",
     "CraftSpider",
+    "QuietMisdreavus",
 ]
 
 [[github]]
diff --git a/teams/wg-async.toml b/teams/wg-async.toml
index ea61aa35a..5f009ec24 100644
--- a/teams/wg-async.toml
+++ b/teams/wg-async.toml
@@ -21,6 +21,7 @@ members = [
 alumni = [
   "Aaron1011",
   "LucioFranco",
+  "MajorBreakfast",
   "bIgBV",
   "betamos",
   "cramertj",
diff --git a/teams/wg-embedded.toml b/teams/wg-embedded.toml
index c7059435c..0bbc1479d 100644
--- a/teams/wg-embedded.toml
+++ b/teams/wg-embedded.toml
@@ -40,6 +40,7 @@ alumni = [
     "jcsoo",
     "korken89",
     "laanwj",
+    "levex",
     "paoloteti",
     "parched",
     "pftbest",