diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4420d2bf675..fa34ca8623b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,15 +1,15 @@
 # Team responsible for Fleet Server
 * @elastic/elastic-agent-control-plane
 
-/.github/CODEOWNERS @elastic/ingest-tech-lead
-
-/deploy/kubernetes @elastic/obs-cloudnative-monitoring
-/dev-tools/kubernetes @elastic/obs-cloudnative-monitoring
-/internal/pkg/composable/providers/kubernetes @elastic/obs-cloudnative-monitoring
-/internal/pkg/agent/application/configuration_embed_changed_test.go @elastic/cloudbeat
+# Top-level files ownership
+/catalog-info.yaml @elastic/ingest-eng-prod
 
-# Ownership of CI or related files by the Ingest Eng Prod team
+# Sub-directories/files ownership. Remember that order matters; the last matching pattern takes the most precedence.
 /.buildkite @elastic/ingest-eng-prod
 /.ci @elastic/ingest-eng-prod
 /.github @elastic/ingest-eng-prod
-/catalog-info.yaml @elastic/ingest-eng-prod
+/.github/CODEOWNERS @elastic/ingest-tech-lead
+/deploy/kubernetes @elastic/obs-cloudnative-monitoring
+/dev-tools/kubernetes @elastic/obs-cloudnative-monitoring
+/internal/pkg/agent/application/configuration_embed_changed_test.go @elastic/cloudbeat
+/internal/pkg/composable/providers/kubernetes @elastic/obs-cloudnative-monitoring