diff --git a/CODEOWNERS b/CODEOWNERS
index 65f098292..d0858165a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,7 +1,31 @@
+/ci @tsusanka
+
+/common/defs @prusnak @matejcik
+
+/common/protob @tsusanka @matejcik
+
+/core/embed @prusnak
+
+/core/src/apps/webauthn @andrewkozlik
+
+/core/src/storage @andrewkozlik
+
+/core/src/trezor @tsusanka @matejcik
+
+/core/tests @tsusanka
+
+/core/tools @matejcik
+
+/crypto @andrewkozlik @onvej-sl @prusnak
+
+/docs @tsusanka
+
 /legacy @prusnak
 
 /python @matejcik
 
 /storage @andrewkozlik
 
+/tests @tsusanka @matejcik
+
 /vendor @prusnak