diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 472b0c1e49..441bc3c78a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,10 +1,9 @@
 /docs/ @apollographql/docs
 /.changesets/ @apollographql/docs
-/apollo-federation/ @apollographql/fed-core @apollographql/rust-platform
-/apollo-federation/src/connectors @apollographql/graph-dev
+/apollo-federation/ @apollographql/orchestration-language @apollographql/rust-platform
 /apollo-router/ @apollographql/router-core
-/apollo-router/src/plugins/connectors @apollographql/graph-dev
+/apollo-router/src/plugins/connectors @apollographql/orchestration-language
 /apollo-router/src/plugins/fleet_detector.rs @apollographql/runtime-readiness
-/apollo-router-benchmarks/ @apollographql/router-core @apollographql/fed-core
-/examples/ @apollographql/router-core @apollographql/fed-core
+/apollo-router-benchmarks/ @apollographql/router-core @apollographql/orchestration-language
+/examples/ @apollographql/router-core
 /.github/CODEOWNERS @apollographql/router-core @apollographql/fed-core