diff --git a/OWNERS b/OWNERS
index 1a0bc5a8620..0d5bc3b333b 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,11 @@
-assignees:
+reviewers:
+  - brendandburns
+  - dchen1107
+  - jbeda
+  - lavalamp
+  - smarterclayton
+  - thockin
+approvers:
   - bgrant0607
   - brendandburns
   - dchen1107
diff --git a/build/OWNERS b/build/OWNERS
index 8ed24bb7b33..85cb3c626d6 100644
--- a/build/OWNERS
+++ b/build/OWNERS
@@ -1,4 +1,10 @@
-assignees:
+reviewers:
+  - ihmccreery
+  - ixdy
+  - jbeda
+  - lavalamp
+  - zmerlynn
+approvers:
   - ihmccreery
   - ixdy
   - jbeda
diff --git a/cluster/OWNERS b/cluster/OWNERS
index 2716fee8328..4e3f78778f0 100644
--- a/cluster/OWNERS
+++ b/cluster/OWNERS
@@ -1,4 +1,10 @@
-assignees:
+reviewers:
+  - eparis
+  - jbeda
+  - mikedanese
+  - roberthbailey
+  - zmerlynn
+approvers:
   - eparis
   - jbeda
   - mikedanese
diff --git a/cmd/OWNERS b/cmd/OWNERS
index 03ca52f2b64..82e379f36b1 100644
--- a/cmd/OWNERS
+++ b/cmd/OWNERS
@@ -1,4 +1,9 @@
-assignees:
+reviewers:
+  - dchen1107
+  - lavalamp
+  - mikedanese
+  - thockin
+approvers:
   - dchen1107
   - lavalamp
   - mikedanese
diff --git a/docs/OWNERS b/docs/OWNERS
index 1c719a4d18b..0f4d3337522 100644
--- a/docs/OWNERS
+++ b/docs/OWNERS
@@ -1,5 +1,8 @@
-assignees:
-  - bgrant0607
+reviewers:
+  - brendandburns
+  - smarterclayton
+  - thockin
+approvers:
   - brendandburns
   - smarterclayton
   - thockin
diff --git a/examples/OWNERS b/examples/OWNERS
index 3dacd67df94..30bb8b07c6d 100644
--- a/examples/OWNERS
+++ b/examples/OWNERS
@@ -1,5 +1,8 @@
-assignees:
-  - bgrant0607
+reviewers:
+  - brendandburns
+  - thockin
+  - zmerlynn
+approvers:
   - brendandburns
   - thockin
   - zmerlynn
diff --git a/federation/OWNERS b/federation/OWNERS
index a3de529fa86..b69684f666f 100644
--- a/federation/OWNERS
+++ b/federation/OWNERS
@@ -1,5 +1,9 @@
-assignees:
-  - quinton-hoole
+reviewers:
+  - madhusudancs
+  - mml
+  - nikhiljindal
+  - colhom
+approvers:
   - madhusudancs
   - mml
   - nikhiljindal
diff --git a/hack/OWNERS b/hack/OWNERS
index 12b89b2abc8..4e27e641244 100644
--- a/hack/OWNERS
+++ b/hack/OWNERS
@@ -1,4 +1,12 @@
-assignees:
+reviewers:
+  - eparis
+  - ihmccreery
+  - ixdy
+  - jbeda
+  - lavalamp
+  - spxtr
+  - zmerlynn
+approvers:
   - eparis
   - ihmccreery
   - ixdy
diff --git a/logo/OWNERS b/logo/OWNERS
index d22a189155f..82fc53c3465 100644
--- a/logo/OWNERS
+++ b/logo/OWNERS
@@ -1,2 +1,4 @@
-assignees:
+reviewers:
+  - thockin
+approvers:
   - thockin
diff --git a/pkg/OWNERS b/pkg/OWNERS
index c79bb80fffb..1b48f841405 100644
--- a/pkg/OWNERS
+++ b/pkg/OWNERS
@@ -1,4 +1,10 @@
-assignees:
+reviewers:
+  - brendandburns
+  - dchen1107
+  - lavalamp
+  - smarterclayton
+  - thockin
+approvers:
   - brendandburns
   - dchen1107
   - lavalamp
diff --git a/pkg/api/OWNERS b/pkg/api/OWNERS
index 569ba5b5d93..3a9b0c6d159 100644
--- a/pkg/api/OWNERS
+++ b/pkg/api/OWNERS
@@ -1,5 +1,4 @@
 approvers:
-- bgrant0607
 - erictune
 - lavalamp
 - smarterclayton
@@ -9,7 +8,6 @@ reviewers:
 - lavalamp
 - smarterclayton
 - wojtek-t
-- bgrant0607
 - deads2k
 - yujuhong
 - brendandburns
diff --git a/pkg/api/validation/OWNERS b/pkg/api/validation/OWNERS
index 97ba3bd9494..dda6d4862e8 100755
--- a/pkg/api/validation/OWNERS
+++ b/pkg/api/validation/OWNERS
@@ -3,7 +3,6 @@ reviewers:
 - lavalamp
 - smarterclayton
 - wojtek-t
-- bgrant0607
 - deads2k
 - yujuhong
 - brendandburns
diff --git a/pkg/apis/OWNERS b/pkg/apis/OWNERS
index d67265f5f27..2554bfcc77c 100644
--- a/pkg/apis/OWNERS
+++ b/pkg/apis/OWNERS
@@ -1,5 +1,4 @@
 approvers:
-- bgrant0607
 - erictune
 - lavalamp
 - smarterclayton
diff --git a/pkg/cloudprovider/OWNERS b/pkg/cloudprovider/OWNERS
index fa22a933c04..657fe57964b 100644
--- a/pkg/cloudprovider/OWNERS
+++ b/pkg/cloudprovider/OWNERS
@@ -1,2 +1,42 @@
 approvers:
 - mikedanese
+reviewers:
+- thockin
+- lavalamp
+- smarterclayton
+- wojtek-t
+- deads2k
+- brendandburns
+- derekwaynecarr
+- caesarxuchao
+- vishh
+- mikedanese
+- liggitt
+- bprashanth
+- gmarek
+- erictune
+- davidopp
+- pmorie
+- sttts
+- quinton-hoole
+- dchen1107
+- saad-ali
+- zmerlynn
+- luxas
+- justinsb
+- roberthbailey
+- eparis
+- jlowdermilk
+- piosz
+- jsafrane
+- dims
+- krousey
+- rootfs
+- jszczepkowski
+- markturansky
+- vmarmol
+- girishkalele
+- satnam6502
+- jdef
+- freehan
+- jingxu97
diff --git a/pkg/genericapiserver/endpoints/OWNERS b/pkg/genericapiserver/endpoints/OWNERS
index dec7cfcdf75..bbf15ef1ba9 100644
--- a/pkg/genericapiserver/endpoints/OWNERS
+++ b/pkg/genericapiserver/endpoints/OWNERS
@@ -8,7 +8,6 @@ reviewers:
 - lavalamp
 - smarterclayton
 - wojtek-t
-- bgrant0607
 - deads2k
 - derekwaynecarr
 - caesarxuchao
diff --git a/pkg/registry/OWNERS b/pkg/registry/OWNERS
index c1d7bfa2906..02323bf506e 100644
--- a/pkg/registry/OWNERS
+++ b/pkg/registry/OWNERS
@@ -7,7 +7,6 @@ reviewers:
 - lavalamp
 - smarterclayton
 - wojtek-t
-- bgrant0607
 - deads2k
 - yujuhong
 - derekwaynecarr
diff --git a/plugin/OWNERS b/plugin/OWNERS
index 2c7bcdee59e..1f32c648a18 100644
--- a/plugin/OWNERS
+++ b/plugin/OWNERS
@@ -1,4 +1,10 @@
-assignees:
+reviewers:
+  - brendandburns
+  - davidopp
+  - dchen1107
+  - lavalamp
+  - thockin
+approvers:
   - brendandburns
   - davidopp
   - dchen1107
diff --git a/staging/src/k8s.io/apimachinery/pkg/api/errors/OWNERS b/staging/src/k8s.io/apimachinery/pkg/api/errors/OWNERS
index 155e203d6cf..ae828ad2536 100755
--- a/staging/src/k8s.io/apimachinery/pkg/api/errors/OWNERS
+++ b/staging/src/k8s.io/apimachinery/pkg/api/errors/OWNERS
@@ -3,7 +3,6 @@ reviewers:
 - lavalamp
 - smarterclayton
 - wojtek-t
-- bgrant0607
 - deads2k
 - brendandburns
 - derekwaynecarr
diff --git a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS
index 155e203d6cf..ae828ad2536 100755
--- a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS
+++ b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS
@@ -3,7 +3,6 @@ reviewers:
 - lavalamp
 - smarterclayton
 - wojtek-t
-- bgrant0607
 - deads2k
 - brendandburns
 - derekwaynecarr
diff --git a/staging/src/k8s.io/client-go/pkg/api/OWNERS b/staging/src/k8s.io/client-go/pkg/api/OWNERS
index 569ba5b5d93..3a9b0c6d159 100644
--- a/staging/src/k8s.io/client-go/pkg/api/OWNERS
+++ b/staging/src/k8s.io/client-go/pkg/api/OWNERS
@@ -1,5 +1,4 @@
 approvers:
-- bgrant0607
 - erictune
 - lavalamp
 - smarterclayton
@@ -9,7 +8,6 @@ reviewers:
 - lavalamp
 - smarterclayton
 - wojtek-t
-- bgrant0607
 - deads2k
 - yujuhong
 - brendandburns
diff --git a/test/OWNERS b/test/OWNERS
index 0cd4be1bf5e..21a5d9ce417 100644
--- a/test/OWNERS
+++ b/test/OWNERS
@@ -1,4 +1,8 @@
-assignees:
+reviewers:
+  - fejta
+  - ixdy
+  - spxtr
+approvers:
   - fejta
   - ixdy
   - spxtr