diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7097d57c6b..fbd09f5799 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -9,10 +9,3 @@
 
 # global owners
 * @celestiaorg/celestia-core
-
-# directory owners
-# NOTE: the directory owners should include the global owners unless the global
-# owner is fully deferring ownership to the directory owner
-docs @liamsi @celestiaorg/celestia-core
-specs @liamsi @celestiaorg/celestia-core
-x/blobstream @rach-id @evan-forbes
diff --git a/.github/auto_request_review.yml b/.github/auto_request_review.yml
index a00957c0e3..32ab61b10e 100644
--- a/.github/auto_request_review.yml
+++ b/.github/auto_request_review.yml
@@ -1,11 +1,11 @@
 # More info at https://github.com/necojackarc/auto-request-review
 reviewers:
-  # The default reviewers
   defaults:
-    # Example of Github Team. Github team must have write access to repo.
-    # NOTE: This assigned the team itself, not members of the team. The Github
-    # team auto PR assignment will then turn this into individuals
-    - team:celestia-core # This is the Github Team
+    - cmwaters
+    - evan-forbes
+    - ninabarbakadze
+    - rach-id
+    - rootulp
 
 options:
   ignore_draft: true