diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 224f30978c01..ac9754aa1447 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -40,4 +40,17 @@
 /heartbeat/ @elastic/uptime
 
 # Winlogbeat
+<<<<<<< HEAD
 /x-pack/winlogbeat/ @elastic/siem
+=======
+/x-pack/winlogbeat/ @elastic/security-external-integrations
+
+# Beats Build Specific
+/dev-tools/mage/ @elastic/beats
+/dev-tools/make/ @elastic/beats 
+/dev-tools/packaging/ @elastic/beats 
+
+# CI Specific
+/.ci/ @elastic/observablt-robots
+/Jenkinsfile @elastic/observablt-robots
+>>>>>>> 2c927f0552 (chore: add build scripts to CODEOWNERS (#28615))