diff --git a/OWNERS b/OWNERS
index 911f0bba78f..b179eddbfd9 100644
--- a/OWNERS
+++ b/OWNERS
@@ -17,7 +17,7 @@ per-file CHANGELOG.md,AUTHORS,.gitattributes,.gitconfig,.gitignore=*
 per-file CONTRIBUTING.md,LICENSE,PATENT_GRANT,README.*,SECURITY.md=file:/tools/OWNERS_PRODUCT
 
 # Top level build files
-per-file .clang-format,BUILD.gn,sdk_args.gni=file:/tools/OWNERS_VM
+per-file .clang-format,BUILD.gn,sdk_args.gni=file:/tools/OWNERS_BUILD
 
 # Generated file
 per-file .packages=*
diff --git a/build/OWNERS b/build/OWNERS
index 2b67506d84c..24995df040e 100644
--- a/build/OWNERS
+++ b/build/OWNERS
@@ -1 +1 @@
-file:/tools/OWNERS_ENG
+file:/tools/OWNERS_BUILD
diff --git a/tools/OWNERS b/tools/OWNERS
index 8d66888afc8..fa2dc564624 100644
--- a/tools/OWNERS
+++ b/tools/OWNERS
@@ -2,6 +2,7 @@ file:OWNERS_INFRA
 
 # Groups administrate themselves.
 per-file OWNERS_ANALYZER=file:OWNERS_ANALYZER
+per-file OWNERS_BUILD=file:OWNERS_BUILD
 per-file OWNERS_CFE=file:OWNERS_CFE
 per-file OWNERS_ECOSYSTEM=file:OWNERS_ECOSYSTEM
 per-file OWNERS_FOUNDATION=file:OWNERS_FOUNDATION
@@ -11,3 +12,6 @@ per-file OWNERS_PRODUCT=file:OWNERS_PRODUCT
 per-file OWNERS_PUB=file:OWNERS_PUB
 per-file OWNERS_VM=file:OWNERS_VM
 per-file OWNERS_WEB=file:OWNERS_WEB
+
+# Changed along with build files
+per-file *.py=file:OWNERS_BUILD
diff --git a/tools/OWNERS_BUILD b/tools/OWNERS_BUILD
new file mode 100644
index 00000000000..2d5cb004cba
--- /dev/null
+++ b/tools/OWNERS_BUILD
@@ -0,0 +1,2 @@
+file:OWNERS_INFRA
+file:OWNERS_VM