diff --git a/CODEOWNERS b/CODEOWNERS
index 15ff1f56a0..37d1380649 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,3 +1,13 @@
 # Members of ftl-reviewers will be round-robined per the code review settings in the team profile:
 #   https://github.com/orgs/TBD54566975/teams/ftl-reviewers/edit/review_assignment
-*       @TBD54566975/ftl-reviewers @alecthomas
+
+# By default ftl-reviewers will be added to all PRs.
+*                @TBD54566975/ftl-reviewers @alecthomas
+
+# Below are team-specific overrides. These should supercede the default ftl-reviewers team.
+frontend/        @TBD54566975/ftl-frontend-team
+pnpm-*           @TBD54566975/ftl-frontend-team
+rust-runtime/    @gak
+go-runtime/      @TBD54566975/ftl-go-team
+jvm-runtime/     @TBD54566975/ftl-jvm-team
+deployment/      @TBD54566975/ftl-infra-team
diff --git a/deployment/CODEOWNERS b/deployment/CODEOWNERS
deleted file mode 100644
index 18eeaebb4e..0000000000
--- a/deployment/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* @TBD54566975/ftl-infra-team
diff --git a/frontend/CODEOWNERS b/frontend/CODEOWNERS
deleted file mode 100644
index 97b5c30eae..0000000000
--- a/frontend/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* @TBD54566975/ftl-frontend-team
diff --git a/go-runtime/CODEOWNERS b/go-runtime/CODEOWNERS
deleted file mode 100644
index 7e0a416280..0000000000
--- a/go-runtime/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* @TBD54566975/ftl-go-team
diff --git a/jvm-runtime/CODEOWNERS b/jvm-runtime/CODEOWNERS
deleted file mode 100644
index 811ae72a1c..0000000000
--- a/jvm-runtime/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* @TBD54566975/ftl-jvm-team
diff --git a/rust-runtime/CODEOWNERS b/rust-runtime/CODEOWNERS
deleted file mode 100644
index 5b51b98f9e..0000000000
--- a/rust-runtime/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* @gak