diff --git a/OWNERS b/OWNERS
index e5d05338..c90c5b67 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,6 +1,7 @@
 # The OWNERS file is used by prow to automatically merge approved PRs.
 
 approvers:
-- evankanderson
-- mattmoor
-- vaikas-google
+- caching-approvers
+
+reviewers:
+- caching-reviewers
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
new file mode 100644
index 00000000..547d1467
--- /dev/null
+++ b/OWNERS_ALIASES
@@ -0,0 +1,25 @@
+aliases:
+  caching-approvers:
+  - evankanderson
+  - mattmoor
+  - vaikas-google
+  caching-reviewers:
+  - evankanderson
+  - mattmoor
+  - vaikas-google
+
+  productivity-approvers:
+  - adrcunha
+  - chaodaiG
+  - srinivashegde86
+  productivity-reviewers:
+  - adrcunha
+  - chaodaiG
+  - coryrc
+  - dushyanthsc
+  - ericKlawitter
+  - Fredy-Z
+  - nbarthwal
+  - srinivashegde86
+  - steuhs
+  - yt3liu
diff --git a/hack/OWNERS b/hack/OWNERS
index d6d72cde..c50adc84 100644
--- a/hack/OWNERS
+++ b/hack/OWNERS
@@ -1,4 +1,10 @@
 # The OWNERS file is used by prow to automatically merge approved PRs.
 
 approvers:
-- adrcunha
+- productivity-approvers
+
+reviewers:
+- productivity-reviewers
+
+labels:
+- area/test-and-release
diff --git a/test/OWNERS b/test/OWNERS
index ed29d401..c50adc84 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