diff --git a/CODEOWNERS b/CODEOWNERS
index 83d74b9538..371f21f368 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,9 +2,9 @@
 # Directories first
 
 [Arch AArch64] @chris @gedare @joel @opticron
-/bsps/aarch64/
-/cpukit/score/cpu/aarch64/
-/spec/build/bsps/aarch64/
+/bsps/aarch64/**
+/cpukit/score/cpu/aarch64/**
+/spec/build/bsps/aarch64/**
 /cpukit/libdebugger/rtems-debugger-aarch64.c
 /cpukit/libdl/rtl-mdreloc-aarch64.c
 /spec/build/cpukit/cpuaarch64.yml
@@ -13,9 +13,9 @@
 
 
 [Arch SPARC] @joel @gedare
-/bsps/sparc/
-/cpukit/score/cpu/sparc/
-/spec/build/bsps/sparc/
+/bsps/sparc/**
+/cpukit/score/cpu/sparc/**
+/spec/build/bsps/sparc/**
 /spec/build/cpukit/cpusparc.yml
 /spec/build/cpukit/objdlsparc.yml
 /spec/build/testsuites/validation/bsps/*-sparc-*