diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9f2a71dc44..d548229b83 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
-/.* @thecotne @robwalsh21 @milosyuki @lorcan-codes @jopedroliveira @rafaelcruzazevedo @nuno-aac @luisdralves
-/*.* @thecotne @robwalsh21 @milosyuki @lorcan-codes @jopedroliveira @rafaelcruzazevedo @nuno-aac @luisdralves
-/src/ @thecotne @robwalsh21 @milosyuki @lorcan-codes @jopedroliveira @rafaelcruzazevedo @nuno-aac @luisdralves
-/workspaces/ @thecotne @robwalsh21 @milosyuki @lorcan-codes @jopedroliveira @rafaelcruzazevedo @nuno-aac @luisdralves
+/.* @jopedroliveira @rafaelcruzazevedo @nuno-aac @luisdralves @PedroBailaAndrade
+/*.* @jopedroliveira @rafaelcruzazevedo @nuno-aac @luisdralves @PedroBailaAndrade
+/src/ @jopedroliveira @rafaelcruzazevedo @nuno-aac @luisdralves @PedroBailaAndrade
+/workspaces/ @jopedroliveira @rafaelcruzazevedo @nuno-aac @luisdralves @PedroBailaAndrade