diff --git a/teams/compiler-maintainers.toml b/teams/compiler-maintainers.toml
deleted file mode 100644
index 91c5322a5..000000000
--- a/teams/compiler-maintainers.toml
+++ /dev/null
@@ -1,51 +0,0 @@
-name = "compiler-maintainers"
-subteam-of = "compiler"
-
-[people]
-leads = []
-members = [
-    "BoxyUwU",
-    "chenyukang",
-    "cjgillot",
-    "compiler-errors",
-    "davidtwco",
-    "estebank",
-    "fee1-dead",
-    "jackh726",
-
-    "lcnr",
-    "lqd",
-    "Mark-Simulacrum",
-    "matthewjasper",
-    "Nadrieril",
-    "nagisa",
-    "nnethercote",
-    "Noratrieb",
-    "oli-obk",
-    "petrochenkov",
-    "saethlin",
-    "SparrowLii",
-    "spastorino",
-    "wesleywiser",
-]
-alumni = [
-    "Aaron1011",
-    "Aatch",
-    "arielb1",
-    "bkoropoff",
-    "cramertj",
-    "dotdash",
-    "eddyb",
-    "michaelwoerister",
-    "jseyfried",
-    "nikomatsakis",
-    "nrc",
-    "pnkfelix",
-    "varkor",
-    "Zoxc",
-]
-
-[website]
-name = "Compiler maintainers"
-repo = "https://github.com/rust-lang/compiler-team"
-description = "Maintainers of the compiler"
diff --git a/teams/compiler.toml b/teams/compiler.toml
index dcb148609..1452a0458 100644
--- a/teams/compiler.toml
+++ b/teams/compiler.toml
@@ -8,46 +8,45 @@ members = [
     "apiraino",
     "b-naber",
     "bjorn3",
-    "BoxyUwU",
+    { github = "BoxyUwU", roles = ["compiler-maintainer"] },
     "camelid",
-    "chenyukang",
+    { github = "chenyukang", roles = ["compiler-maintainer"] },
     "ChrisDenton",
-    "cjgillot", 
-    "compiler-errors",
+    { github = "cjgillot",  roles = ["compiler-maintainer"] },
+    { github = "compiler-errors", roles = ["compiler-maintainer"] },
     "cuviper",
-    "davidtwco",
+    { github = "davidtwco", roles = ["compiler-maintainer"] },
     "DianQK",
     "durin42",
     "eholk",
     "est31",
-    "estebank",
-    "fee1-dead",
+    { github = "estebank", roles = ["compiler-maintainer"] },
+    { github = "fee1-dead", roles = ["compiler-maintainer"] },
     "flodiebold",
     "fmease", 
-    "jackh726",
+    { github = "jackh726", roles = ["compiler-maintainer"] },
     "jieyouxu",
     "jswrenn",
-    "lcnr",
-    "lqd",
+    { github = "lcnr", roles = ["compiler-maintainer"] },
+    { github = "lqd", roles = ["compiler-maintainer"] },
     "lukas-code",
     "m-ou-se",
-    "Mark-Simulacrum",
-    "matthewjasper",
-    "Nadrieril",
-    "nagisa",
+    { github = "Mark-Simulacrum", roles = ["compiler-maintainer"] },
+    { github = "matthewjasper", roles = ["compiler-maintainer"] },
+    { github = "Nadrieril", roles = ["compiler-maintainer"] },
+    { github = "nagisa", roles = ["compiler-maintainer"] },
     "nikic",
     "nikomatsakis",
     "Noratrieb",
-    "nnethercote",
-    "oli-obk",
-    "petrochenkov",
-    "pnkfelix",
+    { github = "nnethercote", roles = ["compiler-maintainer"] },
+    { github = "oli-obk", roles = ["compiler-maintainer"] },
+    { github = "petrochenkov", roles = ["compiler-maintainer"] },
     "RalfJung",
     "rcvalle",
-    "saethlin",
+    { github = "saethlin", roles = ["compiler-maintainer"] },
     "scottmcm",
-    "SparrowLii",
-    "spastorino",
+    { github = "SparrowLii", roles = ["compiler-maintainer"] },
+    { github = "spastorino", roles = ["compiler-maintainer"] },
     "TaKO8Ki",
     "tgross35",
     "the8472",
@@ -55,32 +54,37 @@ members = [
     "tmiasko",
     "Urgau",
     "WaffleLapkin",
-    "wesleywiser",
+    { github = "wesleywiser", roles = ["compiler-maintainer"] },
     "workingjubilee",
     "Zalathar",
 ]
 alumni = [
-    "Aaron1011",
-    "Aatch",
-    "arielb1",
-    "bkoropoff",
+    { github = "Aaron1011", roles = ["compiler-maintainer"] },
+    { github = "Aatch", roles = ["compiler-maintainer"] },
+    { github = "arielb1", roles = ["compiler-maintainer"] },
+    { github = "bkoropoff", roles = ["compiler-maintainer"] },
     "Centril",
-    "cramertj",
-    "dotdash",
+    { github = "cramertj", roles = ["compiler-maintainer"] },
+    { github = "dotdash", roles = ["compiler-maintainer"] },
     "ecstatic-morse",
-    "eddyb",
-    "jseyfried",
+    { github = "eddyb", roles = ["compiler-maintainer"] },
+    { github = "jseyfried", roles = ["compiler-maintainer"] },
     "LeSeulArtichaut",
     "matklad",
-    "michaelwoerister",
-    "nrc",
+    { github = "michaelwoerister", roles = ["compiler-maintainer"] },
+    { github = "nrc", roles = ["compiler-maintainer"] },
+    { github = "pnkfelix", roles = ["compiler-maintainer"] },
     "scalexm",
-    "varkor",
+    { github = "varkor", roles = ["compiler-maintainer"] },
     "Xanewok",
     "zackmdavis",
-    "Zoxc",
+    { github = "Zoxc", roles = ["compiler-maintainer"] }
 ]
 
+[[roles]]
+id = "compiler-maintainer"
+description = "Maintainer"
+
 [permissions]
 perf = true
 crater = true