diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4f828946..a0df28ae 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,8 @@
-@goncalo-frade-iohk @yshyn-iohk @elribonazo @amagyar-iohk
+@goncalo-frade-iohk @yshyn-iohk @elribonazo
 
+# Test related:
+/Sample/ @amagyar-iohk @todorkoleviohk @goncalo-frade-iohk
+/E2E/ @amagyar-iohk @todorkoleviohk @goncalo-frade-iohk
+
+# Docs:
+*.md @petevielhaber