diff --git a/teams/alumni.toml b/teams/alumni.toml
index 53b0924ba..875281b87 100644
--- a/teams/alumni.toml
+++ b/teams/alumni.toml
@@ -5,15 +5,7 @@ name = "alumni"
 
 [people]
 leads = []
-members = [
-    "alercah",
-    "birkenfeld",
-    "gnunicorn",
-    "peschkaj",
-    "rpjohnst",
-    "valgrimm",
-    "whitequark",
-]
+members = []
 # Temporary key that includes all members listed as alumni in the individual
 # teams. This is needed while we migrate away from the alumni team.
 include-all-alumni = true
diff --git a/teams/archive/docs-peers.toml b/teams/archive/docs-peers.toml
new file mode 100644
index 000000000..22a1c8627
--- /dev/null
+++ b/teams/archive/docs-peers.toml
@@ -0,0 +1,13 @@
+name = "docs-peers"
+subteam-of = "docs"
+
+[people]
+leads = []
+members = []
+alumni = [
+    "alercah",
+]
+
+[website]
+name = "Documentation peers"
+description = "Oversight of specific documentation, and coordination with the docs team"
diff --git a/teams/archive/docs.toml b/teams/archive/docs.toml
index c4ce0047d..1a8e81333 100644
--- a/teams/archive/docs.toml
+++ b/teams/archive/docs.toml
@@ -10,6 +10,7 @@ alumni = [
     "GuillaumeGomez",
     "rylev",
     "celaus",
+    "peschkaj",
 ]
 
 [permissions]
diff --git a/teams/archive/lang-shepherds.toml b/teams/archive/lang-shepherds.toml
new file mode 100644
index 000000000..f4803c426
--- /dev/null
+++ b/teams/archive/lang-shepherds.toml
@@ -0,0 +1,10 @@
+name = "lang-shepherds"
+subteam-of = "lang"
+
+[people]
+leads = []
+members = []
+alumni = [
+    "rpjohnst",
+    "whitequark",
+]
diff --git a/teams/archive/reference.toml b/teams/archive/reference.toml
new file mode 100644
index 000000000..358d7fe4b
--- /dev/null
+++ b/teams/archive/reference.toml
@@ -0,0 +1,14 @@
+name = "reference"
+subteam-of = "lang"
+
+[people]
+leads = []
+members = []
+alumni = [
+    "alercah",
+]
+
+[website]
+name = "Reference team"
+description = "Developing and writing the Rust reference"
+zulip-stream = "t-lang/wg-reference"
diff --git a/teams/archive/wg-governance.toml b/teams/archive/wg-governance.toml
new file mode 100644
index 000000000..07980f80e
--- /dev/null
+++ b/teams/archive/wg-governance.toml
@@ -0,0 +1,20 @@
+name = "wg-governance"
+subteam-of = "core"
+kind = "working-group"
+
+[people]
+leads = []
+members = []
+alumni = [
+    "gnunicorn",
+    "valgrimm"
+]
+
+[[lists]]
+address = "governance@rust-lang.org"
+
+[website]
+name = "Governance working group"
+description = "Managing and improving Rust team governance"
+repo = "https://github.com/rust-lang/wg-governance"
+zulip-stream = "wg-governance"
diff --git a/teams/clippy.toml b/teams/clippy.toml
index cd5b4f26d..a7ad4bd41 100644
--- a/teams/clippy.toml
+++ b/teams/clippy.toml
@@ -24,6 +24,7 @@ alumni = [
     "mcarton",
     "phansch",
     "camsteffen",
+    "birkenfeld",
 ]
 
 [permissions]