diff --git a/teams/compiler-maintainers.toml b/teams/compiler-maintainers.toml
index fcba31cf3..91c5322a5 100644
--- a/teams/compiler-maintainers.toml
+++ b/teams/compiler-maintainers.toml
@@ -23,7 +23,6 @@ members = [
     "Noratrieb",
     "oli-obk",
     "petrochenkov",
-    "pnkfelix",
     "saethlin",
     "SparrowLii",
     "spastorino",
@@ -41,6 +40,7 @@ alumni = [
     "jseyfried",
     "nikomatsakis",
     "nrc",
+    "pnkfelix",
     "varkor",
     "Zoxc",
 ]
diff --git a/teams/emacs.toml b/teams/emacs.toml
index 463e9627b..1d066aae7 100644
--- a/teams/emacs.toml
+++ b/teams/emacs.toml
@@ -4,7 +4,6 @@ kind = "marker-team"
 [people]
 leads = []
 members = [
-    "pnkfelix",
     "MicahChalmer",
     "tromey",
     "brotzeit",
diff --git a/teams/goal-owners.toml b/teams/goal-owners.toml
index cbbead7f5..e78a80765 100644
--- a/teams/goal-owners.toml
+++ b/teams/goal-owners.toml
@@ -26,7 +26,6 @@ members = [
     "notriddle",
     "obi1kenobi",
     "oli-obk",
-    "pnkfelix",
     "tmandry",
     "traviscross",
     "weihanglo",
diff --git a/teams/lang.toml b/teams/lang.toml
index d41bd879f..006ef9ecf 100644
--- a/teams/lang.toml
+++ b/teams/lang.toml
@@ -9,7 +9,6 @@ leads = [
 members = [
     "joshtriplett",
     "nikomatsakis",
-    "pnkfelix",
     "scottmcm",
     "tmandry",
     "traviscross",
@@ -20,6 +19,7 @@ alumni = [
     "Centril",
     "cramertj",
     "nrc",
+    "pnkfelix",
     "withoutboats",
     "eddyb",
 ]
diff --git a/teams/opsem.toml b/teams/opsem.toml
index 499060dd3..f08114f53 100644
--- a/teams/opsem.toml
+++ b/teams/opsem.toml
@@ -31,4 +31,4 @@ name = "T-opsem"
 
 [[zulip-groups]]
 name = "T-opsem/meetings"
-extra-people = ["chorman0773", "thomcc", "pnkfelix", "joshlf", "burakemir", "fbq"]
+extra-people = ["chorman0773", "thomcc", "joshlf", "burakemir", "fbq"]
diff --git a/teams/project-negative-impls.toml b/teams/project-negative-impls.toml
index be2460d95..8e23712f1 100644
--- a/teams/project-negative-impls.toml
+++ b/teams/project-negative-impls.toml
@@ -5,14 +5,14 @@ subteam-of = "lang"
 [people]
 leads = [
     "nikomatsakis",
-    "pnkfelix",
 ]
 members = [
     "nikomatsakis",
-    "pnkfelix",
     "spastorino",
 ]
-alumni = []
+alumni = [
+    "pnkfelix",
+]
 
 [website]
 name = "Negative Impls Initiative"
diff --git a/teams/project-stable-mir.toml b/teams/project-stable-mir.toml
index 0d934e323..df14be4a6 100644
--- a/teams/project-stable-mir.toml
+++ b/teams/project-stable-mir.toml
@@ -5,17 +5,16 @@ subteam-of = "compiler"
 [people]
 leads = [
     "celinval",
-    "pnkfelix",
 ]
 members = [
     "celinval",
     "oli-obk",
-    "pnkfelix",
     "scottmcm",
 ]
 alumni = [
     "spastorino",
     "ouz-a",
+    "pnkfelix",
 ]
 
 [website]
diff --git a/teams/spec.toml b/teams/spec.toml
index ba6ec0b04..47ba19e5b 100644
--- a/teams/spec.toml
+++ b/teams/spec.toml
@@ -2,15 +2,16 @@ name = "spec"
 subteam-of = "lang"
 
 [people]
-leads = ["pnkfelix", "JoelMarcey"]
+leads = ["JoelMarcey"]
 members = [
-    "pnkfelix",
     "m-ou-se",
     { github = "JoelMarcey", roles = ["spec-editor"] },
     "ehuss",
     "traviscross",
 ]
-alumni = []
+alumni = [
+    "pnkfelix",
+]
 
 [website]
 name = "Specification team"
diff --git a/teams/wg-async.toml b/teams/wg-async.toml
index aae4e1380..971d20abf 100644
--- a/teams/wg-async.toml
+++ b/teams/wg-async.toml
@@ -11,7 +11,6 @@ members = [
     "guswynn",
     "nikomatsakis",
     "nrc",
-    "pnkfelix",
     "taiki-e",
     "tmandry",
     "traviscross",
@@ -33,6 +32,7 @@ alumni = [
     "lbernick",
     "michaelwoerister",
     "nellshamrell",
+    "pnkfelix",
     "rylev",
     "spastorino",
     "withoutboats",
diff --git a/teams/wg-compiler-performance.toml b/teams/wg-compiler-performance.toml
index 907f1559a..311d53443 100644
--- a/teams/wg-compiler-performance.toml
+++ b/teams/wg-compiler-performance.toml
@@ -8,13 +8,13 @@ members = [
     "Mark-Simulacrum",
     "rylev",
     "tgnottingham",
-    "pnkfelix",
     "Kobzol",
     "lqd",
     "nnethercote",
 ]
 alumni = [
     "michaelwoerister",
+    "pnkfelix",
     "wesleywiser",
 ]
 
diff --git a/teams/wg-debugging.toml b/teams/wg-debugging.toml
index ac814678d..567a5875b 100644
--- a/teams/wg-debugging.toml
+++ b/teams/wg-debugging.toml
@@ -3,15 +3,15 @@ subteam-of = "compiler"
 kind = "working-group"
 
 [people]
-leads = ["pnkfelix", "wesleywiser"]
+leads = ["wesleywiser"]
 members = [
     "davidtwco",
-    "pnkfelix",
     "wesleywiser",
 ]
 alumni = [
     "Manishearth",
     "michaelwoerister",
+    "pnkfelix",
 ]
 
 [website]
diff --git a/teams/wg-incr-comp.toml b/teams/wg-incr-comp.toml
index 77268ffc8..f042dd689 100644
--- a/teams/wg-incr-comp.toml
+++ b/teams/wg-incr-comp.toml
@@ -3,9 +3,9 @@ subteam-of = "compiler"
 kind = "working-group"
 
 [people]
-leads = ["pnkfelix", "wesleywiser"]
-members = ["davidtwco", "pnkfelix", "wesleywiser", "Aaron1011", "cjgillot"]
-alumni = ["michaelwoerister", "pierwill", "spastorino"]
+leads = ["wesleywiser"]
+members = ["davidtwco", "wesleywiser", "Aaron1011", "cjgillot"]
+alumni = ["michaelwoerister", "pierwill", "pnkfelix", "spastorino"]
 
 [[github]]
 orgs = ["rust-lang"]
diff --git a/teams/wg-prioritization.toml b/teams/wg-prioritization.toml
index fab65cff1..d9c8a162a 100644
--- a/teams/wg-prioritization.toml
+++ b/teams/wg-prioritization.toml
@@ -12,7 +12,6 @@ members = [
     "hkmatsumoto",
     "inquisitivecrystal",
     "lcnr",
-    "pnkfelix",
     "wesleywiser",
 ]
 alumni = [
@@ -24,6 +23,7 @@ alumni = [
     "mark-i-m",
     "o0Ignition0o",
     "spastorino",
+    "pnkfelix",
     # The following nicknames listed here to pass validation
     # see https://github.com/rust-lang/team/pull/992
     "am-1t",
@@ -52,7 +52,6 @@ excluded-people = [
     "lcnr",
     "Dylan-DPC",
     "camelid",
-    "pnkfelix",
     "hkmatsumoto",
     "inquisitivecrystal",
 ]