diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 14d907c7c..e233c910e 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -12,3 +12,18 @@ aliases:
   - richieescarez
   docs-reviewers:
   - gyliu513
+  productivity-approvers:
+  - adrcunha
+  - chaodaiG
+  - srinivashegde86
+  productivity-reviewers:
+  - adrcunha
+  - chaodaiG
+  - coryrc
+  - dushyanthsc
+  - ericKlawitter
+  - Fredy-Z
+  - nbarthwal
+  - srinivashegde86
+  - steuhs
+  - yt3liu
diff --git a/test/OWNERS b/test/OWNERS
index ed29d4015..c50adc849 100644
--- a/test/OWNERS
+++ b/test/OWNERS
@@ -1,7 +1,10 @@
 # The OWNERS file is used by prow to automatically merge approved PRs.
 
 approvers:
-- adrcunha
-- jessiezcc
-- srinivashegde86
-- steuhs
+- productivity-approvers
+
+reviewers:
+- productivity-reviewers
+
+labels:
+- area/test-and-release