diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cc9bc0efbc6e..4b754aeb9cbc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -50,10 +50,12 @@
 # Fluid Devtools source
 /packages/tools/devtools/**/src                @microsoft/fluid-cr-devtools
 
-# Non-internal API changes
-/**/api-report/*.public.api.md                 @microsoft/fluid-cr-api
-/**/api-report/*.beta.api.md                   @microsoft/fluid-cr-api
-/**/api-report/*.alpha.api.md                  @microsoft/fluid-cr-api
+# API report changes
+# TODO: if we ever add `.internal` API reports, we will want to omit them here
+/**/api-report/*.api.md                        @microsoft/fluid-cr-api
+/build-tools/**/api-report/*.api.md            @microsoft/fluid-cr-infra
+/server/**/api-report/*.api.md                 @microsoft/fluid-cr-server
+/tools/**/api-report/*.api.md                  # Do not require API review for tools packages
 
 # Changesets and release notes
 /**/.changeset/*.md                            @microsoft/fluid-cr-docs