diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 09265c2caac..c7418d7e7e0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,12 +2,13 @@
 * @elastic/elastic-agent-control-plane
 
 # Top-level files ownership
-/catalog-info.yaml @elastic/observablt-ci
+/catalog-info.yaml @elastic/elastic-agent-control-plane @elastic/observablt-ci
 
 # Sub-directories/files ownership. Remember that order matters; the last matching pattern takes the most precedence.
-/.buildkite @elastic/observablt-ci
-/.ci @elastic/observablt-ci
-/.github @elastic/observablt-ci
+/.buildkite @elastic/elastic-agent-control-plane @elastic/observablt-ci
+/.ci @elastic/elastic-agent-control-plane @elastic/observablt-ci
+/.ci/scripts/update-otel.sh @elastic/elastic-agent-control-plane
+/.github @elastic/elastic-agent-control-plane @elastic/observablt-ci
 /.github/CODEOWNERS @elastic/ingest-tech-lead
 /deploy/helm @elastic/elastic-agent-control-plane
 /deploy/helm/edot-collector @elastic/ingest-otel-data