diff --git a/people/Urgau.toml b/people/Urgau.toml
index 3b236f2a6..7d8eac572 100644
--- a/people/Urgau.toml
+++ b/people/Urgau.toml
@@ -2,3 +2,4 @@ name = "Urgau"
 github = "Urgau"
 github-id = 3616612
 email = "urgau@numericable.fr"
+zulip-id = 327095
diff --git a/people/b-naber.toml b/people/b-naber.toml
index 80fe25449..afa5a1834 100644
--- a/people/b-naber.toml
+++ b/people/b-naber.toml
@@ -2,3 +2,4 @@ name = 'b-naber'
 email = 'b_naber@gmx.de'
 github = 'b-naber'
 github-id = 71934879
+zulip-id = 328097
diff --git a/people/chenyukang.toml b/people/chenyukang.toml
index e4da8fd5b..90867345a 100644
--- a/people/chenyukang.toml
+++ b/people/chenyukang.toml
@@ -2,3 +2,4 @@ name = 'Yukang'
 github = 'chenyukang'
 github-id = 230646
 email = 'moorekang@gmail.com'
+zulip-id = 198166
diff --git a/people/durin42.toml b/people/durin42.toml
index 8f4017691..57a97d884 100644
--- a/people/durin42.toml
+++ b/people/durin42.toml
@@ -2,3 +2,4 @@ name = 'Augie Fackler'
 github = 'durin42'
 github-id = 20269
 email = 'raf@durin42.com'
+zulip-id = 316805
diff --git a/people/jswrenn.toml b/people/jswrenn.toml
index 68474ded8..95d373c7c 100644
--- a/people/jswrenn.toml
+++ b/people/jswrenn.toml
@@ -2,3 +2,4 @@ name = 'Jack Wrenn'
 github = 'jswrenn'
 github-id = 3820879
 email = "jack@wrenn.fyi"
+zulip-id = 219211
diff --git a/people/nikic.toml b/people/nikic.toml
index fe6829892..28cc9449e 100644
--- a/people/nikic.toml
+++ b/people/nikic.toml
@@ -2,3 +2,4 @@ name = "Nikita Popov"
 github = "nikic"
 github-id = 216080
 email = "nikita.ppv@gmail.com"
+zulip-id = 133224
diff --git a/people/tmiasko.toml b/people/tmiasko.toml
index 670cb0269..d4441df46 100644
--- a/people/tmiasko.toml
+++ b/people/tmiasko.toml
@@ -2,3 +2,4 @@ name = 'tmiasko'
 email = 'tomasz.miasko@gmail.com'
 github = 'tmiasko'
 github-id = 51362316
+zulip-id = 352985
diff --git a/repos/rust-lang/ar_archive_writer.toml b/repos/rust-lang/ar_archive_writer.toml
index cabd6333a..3c6a355db 100644
--- a/repos/rust-lang/ar_archive_writer.toml
+++ b/repos/rust-lang/ar_archive_writer.toml
@@ -5,4 +5,3 @@ bots = []
 
 [access.teams]
 compiler = "write"
-compiler-contributors = "write"
diff --git a/repos/rust-lang/calendar-generation.toml b/repos/rust-lang/calendar-generation.toml
index 6a05bc0c7..c05f0806c 100644
--- a/repos/rust-lang/calendar-generation.toml
+++ b/repos/rust-lang/calendar-generation.toml
@@ -5,7 +5,6 @@ bots = ["rustbot"]
 
 [access.teams]
 compiler = "write"
-compiler-contributors = "write"
 crates-io = "write"
 docs-rs = "write"
 infra = "maintain"
diff --git a/repos/rust-lang/calendar.toml b/repos/rust-lang/calendar.toml
index 8ce95862d..66dbc89cc 100644
--- a/repos/rust-lang/calendar.toml
+++ b/repos/rust-lang/calendar.toml
@@ -6,7 +6,6 @@ bots = ["rustbot"]
 [access.teams]
 cargo = "maintain"
 compiler = "maintain"
-compiler-contributors = "maintain"
 crates-io = "maintain"
 docs-rs = "maintain"
 infra = "maintain"
diff --git a/repos/rust-lang/compiler-team.toml b/repos/rust-lang/compiler-team.toml
index ade2e97f5..78ccb6658 100644
--- a/repos/rust-lang/compiler-team.toml
+++ b/repos/rust-lang/compiler-team.toml
@@ -6,7 +6,6 @@ bots = ["rustbot"]
 
 [access.teams]
 compiler = "write"
-compiler-contributors = "write"
 wg-prioritization = "write"
 types = "write"
 
diff --git a/repos/rust-lang/datafrog.toml b/repos/rust-lang/datafrog.toml
index 610eeed86..c6e079fc4 100644
--- a/repos/rust-lang/datafrog.toml
+++ b/repos/rust-lang/datafrog.toml
@@ -6,4 +6,3 @@ bots = []
 [access.teams]
 wg-polonius = "write"
 compiler = "write"
-compiler-contributors = "write"
diff --git a/repos/rust-lang/ena.toml b/repos/rust-lang/ena.toml
index 49fdad188..5bfadfbdf 100644
--- a/repos/rust-lang/ena.toml
+++ b/repos/rust-lang/ena.toml
@@ -5,7 +5,6 @@ bots = []
 
 [access.teams]
 compiler = "write"
-compiler-contributors = "write"
 
 [[branch-protections]]
 pattern = 'master'
diff --git a/repos/rust-lang/odht.toml b/repos/rust-lang/odht.toml
index b5760ab2d..60b160a46 100644
--- a/repos/rust-lang/odht.toml
+++ b/repos/rust-lang/odht.toml
@@ -5,7 +5,6 @@ bots = []
 
 [access.teams]
 compiler = "write"
-compiler-contributors = "write"
 
 [[branch-protections]]
 pattern = "main"
diff --git a/repos/rust-lang/rust-forge.toml b/repos/rust-lang/rust-forge.toml
index 720732e3b..b1c1f1cbe 100644
--- a/repos/rust-lang/rust-forge.toml
+++ b/repos/rust-lang/rust-forge.toml
@@ -7,7 +7,6 @@ bots = ["rustbot"]
 [access.teams]
 community = "maintain"
 compiler = "maintain"
-compiler-contributors = "maintain"
 crates-io = "maintain"
 docs-rs = "maintain"
 infra = "maintain"
diff --git a/repos/rust-lang/rustc-demangle.toml b/repos/rust-lang/rustc-demangle.toml
index fe9b302ee..eadc52a9b 100644
--- a/repos/rust-lang/rustc-demangle.toml
+++ b/repos/rust-lang/rustc-demangle.toml
@@ -5,7 +5,6 @@ bots = []
 
 [access.teams]
 compiler = "write"
-compiler-contributors = "write"
 
 [[branch-protections]]
 pattern = "main"
diff --git a/repos/rust-lang/rustc-dev-guide.toml b/repos/rust-lang/rustc-dev-guide.toml
index 7daffe996..482025f29 100644
--- a/repos/rust-lang/rustc-dev-guide.toml
+++ b/repos/rust-lang/rustc-dev-guide.toml
@@ -9,7 +9,6 @@ compiler = "write"
 wg-rustc-dev-guide = "maintain"
 infra = "write"
 libs = "write"
-compiler-contributors = "write"
 libs-contributors = "write"
 
 [[branch-protections]]
diff --git a/repos/rust-lang/rustc-hash.toml b/repos/rust-lang/rustc-hash.toml
index ace5b7a2a..ff71a3289 100644
--- a/repos/rust-lang/rustc-hash.toml
+++ b/repos/rust-lang/rustc-hash.toml
@@ -5,7 +5,6 @@ bots = []
 
 [access.teams]
 compiler = "write"
-compiler-contributors = "write"
 
 [[branch-protections]]
 pattern = "master"
diff --git a/repos/rust-lang/rustc-rayon.toml b/repos/rust-lang/rustc-rayon.toml
index e9de03450..502c09a9f 100644
--- a/repos/rust-lang/rustc-rayon.toml
+++ b/repos/rust-lang/rustc-rayon.toml
@@ -5,4 +5,3 @@ bots = []
 
 [access.teams]
 compiler = "write"
-compiler-contributors = "write"
diff --git a/repos/rust-lang/rustc-stable-hash.toml b/repos/rust-lang/rustc-stable-hash.toml
index df4574b35..7c6be12af 100644
--- a/repos/rust-lang/rustc-stable-hash.toml
+++ b/repos/rust-lang/rustc-stable-hash.toml
@@ -5,7 +5,6 @@ bots = []
 
 [access.teams]
 compiler = "write"
-compiler-contributors = "write"
 
 [[branch-protections]]
 pattern = "main"
diff --git a/repos/rust-lang/rustc_apfloat.toml b/repos/rust-lang/rustc_apfloat.toml
index 0803cc1d8..e199f4279 100644
--- a/repos/rust-lang/rustc_apfloat.toml
+++ b/repos/rust-lang/rustc_apfloat.toml
@@ -9,7 +9,6 @@ bots = ["rustbot", "rfcbot"]
 
 [access.teams]
 compiler = 'maintain'
-compiler-contributors = 'maintain'
 
 # Likewise, eventually we may want a branch protections section, but we will
 # tackle that later.
diff --git a/repos/rust-lang/rustc_codegen_c.toml b/repos/rust-lang/rustc_codegen_c.toml
index 81ca2d195..630a2e37d 100644
--- a/repos/rust-lang/rustc_codegen_c.toml
+++ b/repos/rust-lang/rustc_codegen_c.toml
@@ -6,7 +6,6 @@ bots = []
 [access.teams]
 codegen-c-maintainers = "maintain"
 compiler = "maintain"
-compiler-contributors = "write"
 
 [[branch-protections]]
 pattern = "main"
diff --git a/repos/rust-lang/thorin.toml b/repos/rust-lang/thorin.toml
index 3e922d193..467672f88 100644
--- a/repos/rust-lang/thorin.toml
+++ b/repos/rust-lang/thorin.toml
@@ -5,7 +5,6 @@ bots = ["rustbot"]
 
 [access.teams]
 compiler = 'maintain'
-compiler-contributors = 'maintain'
 
 [[branch-protections]]
 pattern = "main"
diff --git a/teams/compiler-contributors.toml b/teams/compiler-contributors.toml
deleted file mode 100644
index d24dd6998..000000000
--- a/teams/compiler-contributors.toml
+++ /dev/null
@@ -1,67 +0,0 @@
-name = "compiler-contributors"
-subteam-of = "compiler"
-
-[people]
-leads = []
-members = [
-    "alexcrichton",
-    "apiraino",
-    "b-naber",
-    "bjorn3",
-    "BoxyUwU",
-    "camelid",
-    "chenyukang",
-    "cuviper",
-    "durin42",
-    "eholk",
-    "est31",
-    "fee1-dead",
-    "flodiebold",
-    "fmease",
-    "jieyouxu",
-    "lqd",
-    "lukas-code",
-    "Mark-Simulacrum",
-    "Nadrieril",
-    "nikic",
-    "nikomatsakis",
-    "nnethercote",
-    "Noratrieb",
-    "RalfJung",
-    "saethlin",
-    "SparrowLii",
-    "spastorino",
-    "tgross35",
-    "the8472",
-    "tmandry",
-    "tmiasko",
-    "TaKO8Ki",
-    "Urgau",
-    "WaffleLapkin",
-    "Zalathar",
-]
-alumni = [
-    "Centril",
-    "LeSeulArtichaut",
-    "zackmdavis",
-    "matklad",
-    "ecstatic-morse",
-    "scalexm",
-    "varkor",
-    "Xanewok",
-]
-
-[permissions]
-perf = true
-crater = true
-dev-desktop = true
-bors.rust.review = true
-
-[[github]]
-orgs = ["rust-lang", "rust-lang-nursery"]
-extra-teams = ["compiler"]
-
-[website]
-name = "Compiler team contributors"
-repo = "http://github.com/rust-lang/compiler-team"
-description = "Contributing to the Rust compiler on a regular basis"
diff --git a/teams/compiler-fcp.toml b/teams/compiler-fcp.toml
new file mode 100644
index 000000000..e5a722b58
--- /dev/null
+++ b/teams/compiler-fcp.toml
@@ -0,0 +1,26 @@
+name = "compiler-fcp"
+subteam-of = "compiler"
+
+[people]
+leads = []
+members = [
+    "cjgillot",
+    "compiler-errors",
+    "davidtwco",
+    "estebank",
+    "Mark-Simulacrum",
+    "matthewjasper",
+    "nagisa",
+    "Noratrieb",
+    "oli-obk",
+    "petrochenkov",
+    "SparrowLii",
+    "spastorino",
+    "wesleywiser",
+]
+alumni = []
+
+[rfcbot]
+label = "T-compiler"
+name = "Compiler"
+ping = "rust-lang/compiler-fcp"
diff --git a/teams/compiler-maintainers.toml b/teams/compiler-maintainers.toml
new file mode 100644
index 000000000..2ebf30d4c
--- /dev/null
+++ b/teams/compiler-maintainers.toml
@@ -0,0 +1,49 @@
+name = "compiler-maintainers"
+subteam-of = "compiler"
+
+[people]
+leads = []
+members = [
+    "BoxyUwU",
+    "chenyukang",
+    "cjgillot",
+    "compiler-errors",
+    "davidtwco",
+    "estebank",
+    "jackh726",
+    "lcnr",
+    "lqd",
+    "Mark-Simulacrum",
+    "matthewjasper",
+    "Nadrieril",
+    "nagisa",
+    "nnethercote",
+    "Noratrieb",
+    "oli-obk",
+    "petrochenkov",
+    "pnkfelix",
+    "saethlin",
+    "SparrowLii",
+    "spastorino",
+    "wesleywiser",
+]
+alumni = [
+    "Aaron1011",
+    "Aatch",
+    "arielb1",
+    "bkoropoff",
+    "cramertj",
+    "dotdash",
+    "eddyb",
+    "michaelwoerister",
+    "jseyfried",
+    "nikomatsakis",
+    "nrc",
+    "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 8bf6dab09..ec6a9aef9 100644
--- a/teams/compiler.toml
+++ b/teams/compiler.toml
@@ -4,32 +4,76 @@ top-level = true
 [people]
 leads = ["davidtwco", "wesleywiser"]
 members = [
-    "Aaron1011",
-    "cjgillot",
+    "alexcrichton",
+    "apiraino",
+    "b-naber",
+    "bjorn3",
+    "BoxyUwU",
+    "camelid",
+    "chenyukang",
+    "cjgillot", 
     "compiler-errors",
+    "cuviper",
     "davidtwco",
-    "eddyb",
+    "DianQK",
+    "durin42",
+    "eholk",
+    "est31",
     "estebank",
+    "fee1-dead",
+    "flodiebold",
+    "fmease", 
+    "jackh726",
+    "jieyouxu",
+    "jswrenn",
     "lcnr",
+    "lqd",
+    "lukas-code",
+    "Mark-Simulacrum",
+    "matthewjasper",
+    "Nadrieril",
     "nagisa",
+    "nikic",
+    "nikomatsakis",
+    "Noratrieb",
+    "nnethercote",
     "oli-obk",
     "petrochenkov",
     "pnkfelix",
-    "matthewjasper",
+    "RalfJung",
+    "saethlin",
+    "scottmcm",
+    "SparrowLii",
+    "spastorino",
+    "TaKO8Ki",
+    "tgross35",
+    "the8472",
+    "tmandry",
+    "tmiasko",
+    "Urgau",
+    "WaffleLapkin",
     "wesleywiser",
-    "jackh726",
+    "Zalathar",
 ]
 alumni = [
+    "Aaron1011",
     "Aatch",
     "arielb1",
     "bkoropoff",
+    "Centril",
     "cramertj",
     "dotdash",
+    "ecstatic-morse",
+    "eddyb",
     "jseyfried",
+    "LeSeulArtichaut",
+    "matklad",
     "michaelwoerister",
-    "nikomatsakis",
     "nrc",
+    "scalexm",
     "varkor",
+    "Xanewok",
+    "zackmdavis",
     "Zoxc",
 ]
 
@@ -42,11 +86,6 @@ bors.rust.review = true
 [[github]]
 orgs = ["rust-lang", "rust-lang-nursery"]
 
-[rfcbot]
-label = "T-compiler"
-name = "Compiler"
-ping = "rust-lang/compiler"
-
 [website]
 name = "Compiler team"
 repo = "http://github.com/rust-lang/compiler-team"
@@ -58,19 +97,9 @@ address = "compiler-private@rust-lang.org"
 
 [[lists]]
 address = "compiler@rust-lang.org"
-extra-teams = ["compiler-contributors"]
-extra-people = [
-    "arielb1",
-    "jseyfried",
-]
 
 [[lists]]
 address = "compiler-team@rust-lang.org"
-extra-teams = ["compiler-contributors"]
-extra-people = [
-    "arielb1",
-    "jseyfried",
-]
 
 [[lists]]
 address = "compiler-and-subteams@rust-lang.org"
@@ -81,15 +110,3 @@ name = "T-compiler"
 
 [[zulip-groups]]
 name = "T-compiler/meeting"
-extra-people = [
-    "aturon",
-    "Mark-Simulacrum",
-    "spastorino",
-    "varkor",
-    "arielb1",
-    "cramertj",
-    "bjorn3",
-    "Xanewok",
-    "nellshamrell",
-    "jackh726",
-]