diff --git a/app/controllers/teams.js b/app/controllers/teams.js
index 14eb6a19..e6b5a161 100644
--- a/app/controllers/teams.js
+++ b/app/controllers/teams.js
@@ -18,12 +18,8 @@ export default class TeamsController extends Controller {
     return this.sortedTeamMembers.filter(inTeam('alumni'));
   }
 
-  get coreCLITeamMembers() {
-    return this.sortedTeamMembers.filter(inTeam('cli'));
-  }
-
-  get embroiderTeamMembers() {
-    return this.sortedTeamMembers.filter(inTeam('embroider'));
+  get coreToolingTeamMembers() {
+    return this.sortedTeamMembers.filter(inTeam('tooling'));
   }
 
   get coreTeamMembers() {
@@ -38,10 +34,6 @@ export default class TeamsController extends Controller {
     return this.sortedTeamMembers.filter(inTeam('learning'));
   }
 
-  get typescriptTeamMembers() {
-    return this.sortedTeamMembers.filter(inTeam('typescript'));
-  }
-
   get steeringCommitteeMembers() {
     return this.sortedTeamMembers.filter(inTeam('steering'));
   }
diff --git a/app/templates/teams.hbs b/app/templates/teams.hbs
index 209ec68d..24ad7fbc 100644
--- a/app/templates/teams.hbs
+++ b/app/templates/teams.hbs
@@ -27,17 +27,9 @@
 
   <section class="mb-6">
     <Teams::Team
-      @description="The Ember CLI core team is responsible for maintaining ember-cli, the command line interface for managing and packaging Ember.js applications and addons. The team also maintains many of the addons in the default blueprint as well as fastboot."
-      @members={{this.coreCLITeamMembers}}
-      @name="The Ember CLI Core Team"
-    />
-  </section>
-
-  <section class="mb-6">
-    <Teams::Team
-      @description="The Embroider Core Team is responsible for the Embroider build system."
-      @members={{this.embroiderTeamMembers}}
-      @name="The Embroider Core Team"
+      @description="The Ember Tooling core team is responsible for maintaining ember-cli, Embroider, Glint, Ember's TypeScript integration, and anything related to the Ember build system. The team also maintains many of the addons in the default blueprint as well as fastboot."
+      @members={{this.coreToolingTeamMembers}}
+      @name="The Ember Tooling Core Team"
     />
   </section>
 
@@ -57,14 +49,6 @@
     />
   </section>
 
-  <section class="mb-6">
-    <Teams::Team
-      @description="The Ember TypeScript core team is responsible for Ember’s TypeScript integration, including build tooling, linting, and collaborating with the Framework and Learning teams on API design and teaching materials."
-      @members={{this.typescriptTeamMembers}}
-      @name="The Ember TypeScript Core Team"
-    />
-  </section>
-
   <section>
     <Teams::Team
       @description="Serving as a member of the Core Team(s) of an open source project like Ember is a huge amount of work. These are the emeritus members of the Ember Core Teams, to whom we will always be grateful."
diff --git a/data/team-member/aaron-chambers.md b/data/team-member/aaron-chambers.md
index 4d4ca5cd..f03e386f 100644
--- a/data/team-member/aaron-chambers.md
+++ b/data/team-member/aaron-chambers.md
@@ -7,5 +7,5 @@ twitter: 'https://twitter.com/grandazz'
 image: achambers.jpg
 added: 2023-05-25T13:01:14.573Z
 teams:
-  - embroider
+  - tooling
 ---
diff --git a/data/team-member/chris-manson.md b/data/team-member/chris-manson.md
index ebd9d891..637e607d 100644
--- a/data/team-member/chris-manson.md
+++ b/data/team-member/chris-manson.md
@@ -8,5 +8,5 @@ image: cmanson.jpg
 added: 2018-10-20T09:01:00.000Z
 teams:
   - learning
-  - embroider
+  - tooling
 ---
diff --git a/data/team-member/edward-faulkner.md b/data/team-member/edward-faulkner.md
index c1f15573..8b4d892b 100644
--- a/data/team-member/edward-faulkner.md
+++ b/data/team-member/edward-faulkner.md
@@ -9,5 +9,5 @@ added: 2015-04-08T09:01:00.000Z
 teams:
   - corejs
   - steering
-  - embroider
+  - tooling
 ---
diff --git a/data/team-member/james-davis.md b/data/team-member/james-davis.md
index d697d0b5..72a4e1ad 100644
--- a/data/team-member/james-davis.md
+++ b/data/team-member/james-davis.md
@@ -7,5 +7,5 @@ twitter: 'https://twitter.com/jamscdavis'
 image: jdavis.jpg
 added: 2022-03-09T18:25:00.000Z
 teams:
-  - typescript
+  - tooling
 ---
diff --git a/data/team-member/katie-gengler.md b/data/team-member/katie-gengler.md
index c6668a50..f7206141 100644
--- a/data/team-member/katie-gengler.md
+++ b/data/team-member/katie-gengler.md
@@ -8,6 +8,6 @@ image: kgengler.jpg
 added: 2016-04-14T09:03:00.000Z
 teams:
   - corejs
-  - cli
+  - tooling
   - steering
 ---
diff --git a/data/team-member/kelly-selden.md b/data/team-member/kelly-selden.md
index 224ce585..1692f421 100644
--- a/data/team-member/kelly-selden.md
+++ b/data/team-member/kelly-selden.md
@@ -7,5 +7,5 @@ twitter: 'https://twitter.com/kellyselden'
 image: kellyselden.jpg
 added: 2016-04-16T09:00:00.000Z
 teams:
-  - cli
+  - tooling
 ---
diff --git a/data/team-member/krystan-huffmenne.md b/data/team-member/krystan-huffmenne.md
index 0a339257..70fde74d 100644
--- a/data/team-member/krystan-huffmenne.md
+++ b/data/team-member/krystan-huffmenne.md
@@ -7,6 +7,6 @@ twitter: 'https://twitter.com/hm_krystan'
 image: khuffmenne.jpg
 added: 2023-05-19T00:00:00.000Z
 teams:
-  - typescript
+  - tooling
   - data
 ---
diff --git a/data/team-member/peter-meehan.md b/data/team-member/peter-meehan.md
index a9c49cce..dc3d0f87 100644
--- a/data/team-member/peter-meehan.md
+++ b/data/team-member/peter-meehan.md
@@ -7,5 +7,5 @@ twitter: 'https://twitter.com/22a'
 image: pmeehan.jpg
 added: 2023-08-11T13:00:00Z
 teams:
-  - embroider
+  - tooling
 ---
diff --git a/data/team-member/peter-wagenet.md b/data/team-member/peter-wagenet.md
index 9e177a4d..cd9504b4 100644
--- a/data/team-member/peter-wagenet.md
+++ b/data/team-member/peter-wagenet.md
@@ -7,5 +7,5 @@ image: pwagenet.jpg
 added: 2013-04-02T09:02:00.000Z
 teams:
   - corejs
-  - typescript
+  - tooling
 ---
diff --git a/data/team-member/preston-sego.md b/data/team-member/preston-sego.md
index e4dc6726..41aa17e2 100644
--- a/data/team-member/preston-sego.md
+++ b/data/team-member/preston-sego.md
@@ -7,5 +7,5 @@ twitter: 'https://twitter.com/nullvoxpopuli'
 image: psego.jpeg
 added: 2023-05-25T14:22:20.616Z
 teams:
-  - embroider
+  - tooling
 ---
diff --git a/data/team-member/simon-ihmig.md b/data/team-member/simon-ihmig.md
index f5c8b33e..dfe38049 100644
--- a/data/team-member/simon-ihmig.md
+++ b/data/team-member/simon-ihmig.md
@@ -7,5 +7,5 @@ twitter: 'https://twitter.com/simonihmig'
 image: sihmig.jpeg
 added: 2023-07-01T16:50:00Z
 teams:
-  - embroider
+  - tooling
 ---
diff --git a/tests/unit/controllers/teams-test.js b/tests/unit/controllers/teams-test.js
index 7a43737d..720ba688 100644
--- a/tests/unit/controllers/teams-test.js
+++ b/tests/unit/controllers/teams-test.js
@@ -50,13 +50,25 @@ module('Unit | Controller | teams', function (hooks) {
     ]);
   });
 
-  test('We sort CLI team members by when they were first added', function (assert) {
-    const { coreCLITeamMembers } = this.controller;
+  test('We sort Tooling team members by when they were first added', function (assert) {
+    const { coreToolingTeamMembers } = this.controller;
 
     // Create an intermediate data structure for assertion
-    const output = coreCLITeamMembers.map((teamMember) => teamMember.id);
+    const output = coreToolingTeamMembers.map((teamMember) => teamMember.id);
 
-    assert.deepEqual(output, ['katie-gengler', 'kelly-selden']);
+    assert.deepEqual(output, [
+      'peter-wagenet',
+      'edward-faulkner',
+      'katie-gengler',
+      'kelly-selden',
+      'chris-manson',
+      'james-davis',
+      'krystan-huffmenne',
+      'aaron-chambers',
+      'preston-sego',
+      'simon-ihmig',
+      'peter-meehan',
+    ]);
   });
 
   test('We sort Data team members by when they were first added', function (assert) {