diff --git a/OWNERS b/OWNERS
index 6ae4b59a95..bfcca980eb 100644
--- a/OWNERS
+++ b/OWNERS
@@ -3,20 +3,4 @@ hta@webrtc.org
 mflodman@webrtc.org
 stefan@webrtc.org
 tommi@webrtc.org
-per-file .gitignore=*
-per-file .gn=mbonadei@webrtc.org
-per-file BUILD.gn=mbonadei@webrtc.org
-per-file .../BUILD.gn=mbonadei@webrtc.org
-per-file *.gni=mbonadei@webrtc.org
-per-file .../*.gni=mbonadei@webrtc.org
-per-file .vpython=mbonadei@webrtc.org
-per-file .vpython3=mbonadei@webrtc.org
-per-file AUTHORS=*
-per-file DEPS=*
-per-file pylintrc=mbonadei@webrtc.org
-per-file WATCHLISTS=*
-per-file native-api.md=mbonadei@webrtc.org
-per-file ....lua=titovartem@webrtc.org
-per-file .style.yapf=jleconte@webrtc.org
-per-file *.py=jansson@webrtc.org
-per-file *.py=jleconte@webrtc.org
+include OWNERS_INFRA #{Owners for infra and repo related files}
diff --git a/OWNERS_INFRA b/OWNERS_INFRA
new file mode 100644
index 0000000000..7172570152
--- /dev/null
+++ b/OWNERS_INFRA
@@ -0,0 +1,17 @@
+#Owners for infra and repo related files
+per-file .gitignore=*
+per-file .gn=mbonadei@webrtc.org,jansson@webrtc.org,jleconte@webrtc.org
+per-file BUILD.gn=mbonadei@webrtc.org,jansson@webrtc.org,jleconte@webrtc.org
+per-file .../BUILD.gn=mbonadei@webrtc.org,jansson@webrtc.org,jleconte@webrtc.org
+per-file *.gni=mbonadei@webrtc.org,jansson@webrtc.org,jleconte@webrtc.org
+per-file .../*.gni=mbonadei@webrtc.org,jansson@webrtc.org,jleconte@webrtc.org
+per-file .vpython=mbonadei@webrtc.org,jansson@webrtc.org,jleconte@webrtc.org
+per-file .vpython3=mbonadei@webrtc.org,jansson@webrtc.org,jleconte@webrtc.org
+per-file AUTHORS=*
+per-file DEPS=*
+per-file pylintrc=mbonadei@webrtc.org,jansson@webrtc.org,jleconte@webrtc.org
+per-file WATCHLISTS=*
+per-file native-api.md=mbonadei@webrtc.org
+per-file ....lua=titovartem@webrtc.org
+per-file .style.yapf=jleconte@webrtc.org
+per-file *.py=mbonadei@webrtc.org,jansson@webrtc.org,jleconte@webrtc.org