diff --git a/.github/OWNERS b/.github/OWNERS
index 8443da33fc7..654d8653508 100644
--- a/.github/OWNERS
+++ b/.github/OWNERS
@@ -3,14 +3,13 @@
 reviewers:
   - castrojo
   - cblecker
-  - grodrigues3
   - nikhita
   - parispittman
   - Phillels
 approvers:
   - castrojo
   - cblecker
-  - grodrigues3
+  - nikhita
   - parispittman
   - Phillels
 labels:
diff --git a/hack/OWNERS b/hack/OWNERS
index 175a34805b1..c3c25b96dc5 100644
--- a/hack/OWNERS
+++ b/hack/OWNERS
@@ -9,30 +9,26 @@ reviewers:
   - jbeda
   - juanvallejo
   - lavalamp
-  - zmerlynn
-  - sttts
-  - gmarek
-  - vishh
-  - spiffxp
   - SataQiu
+  - spiffxp
+  - sttts
+  - vishh
   - xichengliudui
+  - zmerlynn
 approvers:
   - bentheelder
   - cblecker
   - deads2k
+  - dims # for local-up-cluster related files
   - eparis
   - fejta
   - ixdy
   - jbeda
   - lavalamp
-  - madhusudancs
-  - pwittrock
-  - shashidharatd
-  - zmerlynn
-  - sttts
-  - gmarek
-  - vishh
   - liggitt
+  - pwittrock
   - soltysh # for sig-cli related stuff
-  - dims # for local-up-cluster related files
   - spiffxp
+  - sttts
+  - vishh
+  - zmerlynn