diff --git a/.github/OWNERS b/.github/OWNERS
new file mode 100644
index 00000000000..cd28cb484b8
--- /dev/null
+++ b/.github/OWNERS
@@ -0,0 +1,5 @@
+approvers:
+  - hbelmiro
+  - DharmitD
+reviewers:
+  - rimolive
diff --git a/scripts/OWNERS b/scripts/OWNERS
new file mode 100644
index 00000000000..cd28cb484b8
--- /dev/null
+++ b/scripts/OWNERS
@@ -0,0 +1,5 @@
+approvers:
+  - hbelmiro
+  - DharmitD
+reviewers:
+  - rimolive
diff --git a/test/OWNERS b/test/OWNERS
index 9c160e6419f..327c01a352b 100644
--- a/test/OWNERS
+++ b/test/OWNERS
@@ -2,7 +2,10 @@ approvers:
   - connor-mccarthy
   - gkcalat
   - jlyaoyuli
+  - hbelmiro
+  - DharmitD
 reviewers:
   - chensun
   - gkcalat
   - jlyaoyuli
+  - rimolive