diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 26826afac6..5bc5562367 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
-/.* @thecotne @robwalsh21 @milosyuki @lorcan-codes @jopedroliveira
-/*.* @thecotne @robwalsh21 @milosyuki @lorcan-codes @jopedroliveira
-/src/ @thecotne @robwalsh21 @milosyuki @lorcan-codes @jopedroliveira
-/workspaces/ @thecotne @robwalsh21 @milosyuki @lorcan-codes @jopedroliveira
+/.* @thecotne @robwalsh21 @milosyuki @lorcan-codes @jopedroliveira @rafaelcruzazevedo @nuno-aac
+/*.* @thecotne @robwalsh21 @milosyuki @lorcan-codes @jopedroliveira @rafaelcruzazevedo @nuno-aac
+/src/ @thecotne @robwalsh21 @milosyuki @lorcan-codes @jopedroliveira @rafaelcruzazevedo @nuno-aac
+/workspaces/ @thecotne @robwalsh21 @milosyuki @lorcan-codes @jopedroliveira @rafaelcruzazevedo @nuno-aac