diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4bd8e68cc30..79c58f1308b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,40 +6,40 @@
 
 # The following patterns are parsed from ./OWNERS.yml
 OWNERS.yml @IamXander
-.bazelignore alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
-.bazelrc alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
-.bazelversion alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
-.clang-format alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
-.eslintignore alex.neben@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com trevor.guidry@mongodb.com
-.eslintrc.yml alex.neben@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com trevor.guidry@mongodb.com
-.mypy.ini alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
-.prettierignore alex.neben@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com trevor.guidry@mongodb.com
-.prettierrc alex.neben@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com trevor.guidry@mongodb.com
-.pydocstyle alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
-.pylintrc alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
-.style.yapf alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
-BUILD.bazel alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
+.bazelignore @10gen/devprod-build
+.bazelrc @10gen/devprod-build
+.bazelversion @10gen/devprod-build
+.clang-format @10gen/devprod-build
+.eslintignore @10gen/devprod-correctness
+.eslintrc.yml @10gen/devprod-correctness
+.mypy.ini @10gen/devprod-build @10gen/devprod-correctness
+.prettierignore @10gen/devprod-correctness
+.prettierrc @10gen/devprod-correctness
+.pydocstyle @10gen/devprod-build @10gen/devprod-correctness
+.pylintrc @10gen/devprod-build @10gen/devprod-correctness
+.style.yapf @10gen/devprod-build @10gen/devprod-correctness
+BUILD.bazel @10gen/devprod-build
 copybara.sky @IamXander
-copybara.staging.sky alex.neben@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com trevor.guidry@mongodb.com
-jsconfig.json alex.neben@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com trevor.guidry@mongodb.com
-package.json alex.neben@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com trevor.guidry@mongodb.com
-pnpm-lock.yaml alex.neben@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com trevor.guidry@mongodb.com
-poetry.lock alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
-pyproject.toml alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
-SConstruct alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
-WORKSPACE.bazel alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
+copybara.staging.sky @10gen/devprod-correctness
+jsconfig.json @10gen/devprod-correctness
+package.json @10gen/devprod-correctness
+pnpm-lock.yaml @10gen/devprod-correctness
+poetry.lock @10gen/devprod-build @10gen/devprod-correctness
+pyproject.toml @10gen/devprod-build @10gen/devprod-correctness
+SConstruct @10gen/devprod-build
+WORKSPACE.bazel @10gen/devprod-build
 
 # The following patterns are parsed from ./bazel/OWNERS.yml
-/bazel/**/* alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
+/bazel/**/* @10gen/devprod-build
 
 # The following patterns are parsed from ./buildfarm/OWNERS.yml
-/buildfarm/**/* alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
+/buildfarm/**/* @10gen/devprod-build
 
 # The following patterns are parsed from ./buildscripts/OWNERS.yml
-/buildscripts/**/* alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
+/buildscripts/**/* @10gen/devprod-build @10gen/devprod-correctness
 
 # The following patterns are parsed from ./buildscripts/resmokelib/OWNERS.yml
-/buildscripts/resmokelib/**/* alex.neben@mongodb.com juan.gu@mongodb.com mikhail.shchatko@mongodb.com steve.gross@mongodb.com trevor.guidry@mongodb.com
+/buildscripts/resmokelib/**/* @10gen/devprod-correctness
 
 # The following patterns are parsed from ./site_scons/OWNERS.yml
-/site_scons/**/* alex.neben@mongodb.com anthony.pratti@mongodb.com daniel.moody@mongodb.com steve.gross@mongodb.com thomas.langston@mongodb.com trevor.guidry@mongodb.com udita.bose@mongodb.com zack.winter@mongodb.com
+/site_scons/**/* @10gen/devprod-build
diff --git a/OWNERS.yml b/OWNERS.yml
index 3c90bd114a2..89c40f9454d 100644
--- a/OWNERS.yml
+++ b/OWNERS.yml
@@ -1,7 +1,4 @@
 version: 1.0.0
-aliases:
-  - //bazel/devprod_build_aliases.yml
-  - //buildscripts/resmokelib/devprod_correctness_aliases.yml
 filters:
   - "OWNERS.yml":
     approvers:
@@ -9,73 +6,73 @@ filters:
       # TODO: add more owners here
   - ".bazelignore":
     approvers:
-      - devprod-build
+      - 10gen/devprod-build
   - ".bazelrc":
     approvers:
-      - devprod-build
+      - 10gen/devprod-build
   - ".bazelversion":
     approvers:
-      - devprod-build
+      - 10gen/devprod-build
   - ".clang-format":
     approvers:
-      - devprod-build
+      - 10gen/devprod-build
   - ".eslintignore":
     approvers:
-      - devprod-correctness
+      - 10gen/devprod-correctness
   - ".eslintrc.yml":
     approvers:
-      - devprod-correctness
+      - 10gen/devprod-correctness
   - ".mypy.ini":
     approvers:
-      - devprod-correctness
-      - devprod-build
+      - 10gen/devprod-correctness
+      - 10gen/devprod-build
   - ".prettierignore":
     approvers:
-      - devprod-correctness
+      - 10gen/devprod-correctness
   - ".prettierrc":
     approvers:
-      - devprod-correctness
+      - 10gen/devprod-correctness
   - ".pydocstyle":
     approvers:
-      - devprod-correctness
-      - devprod-build
+      - 10gen/devprod-correctness
+      - 10gen/devprod-build
   - ".pylintrc":
     approvers:
-      - devprod-correctness
-      - devprod-build
+      - 10gen/devprod-correctness
+      - 10gen/devprod-build
   - ".style.yapf":
     approvers:
-      - devprod-correctness
-      - devprod-build
+      - 10gen/devprod-correctness
+      - 10gen/devprod-build
   - "BUILD.bazel":
     approvers:
-      - devprod-build
+      - 10gen/devprod-build
   - "copybara.sky":
     approvers:
       - IamXander
   - "copybara.staging.sky":
     approvers:
-      - devprod-correctness
+      - 10gen/devprod-correctness
   - "jsconfig.json":
     approvers:
-      - devprod-correctness
+      - 10gen/devprod-correctness
   - "package.json":
     approvers:
-      - devprod-correctness
+      - 10gen/devprod-correctness
   - "pnpm-lock.yaml":
     approvers:
-      - devprod-correctness
+      - 10gen/devprod-correctness
   - "poetry.lock":
     approvers:
-      - devprod-correctness
-      - devprod-build
+      - 10gen/devprod-correctness
+      - 10gen/devprod-build
   - "pyproject.toml":
     approvers:
-      - devprod-correctness
-      - devprod-build
+      - 10gen/devprod-correctness
+      - 10gen/devprod-build
   - "SConstruct":
     approvers:
-      - devprod-build
+      - 10gen/devprod-build
   - "WORKSPACE.bazel":
     approvers:
-      - devprod-build
+      - 10gen/devprod-build
diff --git a/bazel/OWNERS.yml b/bazel/OWNERS.yml
index 5d952908241..1baf21091bc 100644
--- a/bazel/OWNERS.yml
+++ b/bazel/OWNERS.yml
@@ -1,7 +1,5 @@
 version: 1.0.0
-aliases:
-  - //bazel/devprod_build_aliases.yml
 filters:
   - "*":
     approvers:
-      - devprod-build
+      - 10gen/devprod-build
diff --git a/buildfarm/OWNERS.yml b/buildfarm/OWNERS.yml
index 5d952908241..1baf21091bc 100644
--- a/buildfarm/OWNERS.yml
+++ b/buildfarm/OWNERS.yml
@@ -1,7 +1,5 @@
 version: 1.0.0
-aliases:
-  - //bazel/devprod_build_aliases.yml
 filters:
   - "*":
     approvers:
-      - devprod-build
+      - 10gen/devprod-build
diff --git a/buildscripts/OWNERS.yml b/buildscripts/OWNERS.yml
index 76eb64e400f..938b5fe4efc 100644
--- a/buildscripts/OWNERS.yml
+++ b/buildscripts/OWNERS.yml
@@ -1,11 +1,8 @@
 # TODO: This is a really loose alias for a lot of files.
 # TODO: We can tighten this up as we decide more the split between the teams.
 version: 1.0.0
-aliases:
-  - //buildscripts/resmokelib/devprod_correctness_aliases.yml
-  - //bazel/devprod_build_aliases.yml
 filters:
   - "*":
     approvers:
-    - devprod-correctness
-    - devprod-build
+    - 10gen/devprod-correctness
+    - 10gen/devprod-build
diff --git a/buildscripts/resmokelib/OWNERS.yml b/buildscripts/resmokelib/OWNERS.yml
index ea569ecf535..07fb09ca86f 100644
--- a/buildscripts/resmokelib/OWNERS.yml
+++ b/buildscripts/resmokelib/OWNERS.yml
@@ -1,7 +1,5 @@
 version: 1.0.0
-aliases:
-  - //buildscripts/resmokelib/devprod_correctness_aliases.yml
 filters:
   - "*":
     approvers:
-    - devprod-correctness
+    - 10gen/devprod-correctness
diff --git a/site_scons/OWNERS.yml b/site_scons/OWNERS.yml
index 5d952908241..1baf21091bc 100644
--- a/site_scons/OWNERS.yml
+++ b/site_scons/OWNERS.yml
@@ -1,7 +1,5 @@
 version: 1.0.0
-aliases:
-  - //bazel/devprod_build_aliases.yml
 filters:
   - "*":
     approvers:
-      - devprod-build
+      - 10gen/devprod-build