diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b87ec4a66..739278a1b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,11 +3,11 @@
 .githooks/ @luishfonseca
 .github/workflows/ @luishfonseca
 
-core/geom/ @luishfonseca
+**/core/geom/ @luishfonseca
 
-engine/collisions/ @luishfonseca
-engine/input/ @luishfonseca
-engine/physics/ @luishfonseca @fallenatlas
-engine/tools/ @DiogoMendonc-a
+**/engine/collisions/ @luishfonseca
+**/engine/input/ @luishfonseca
+**/engine/physics/ @luishfonseca @fallenatlas
+**/engine/tools/ @DiogoMendonc-a
 
-tesseratos/ @DiogoMendonc-a
+**/tesseratos/ @DiogoMendonc-a