diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d2b0513..df42f0f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,14 +1,14 @@
-*  @meowgorithm @maaslalani
-cursor/  @maaslalani
-filepicker/  @maaslalani
+*  @meowgorithm @bashbunni
+cursor/  @aymanbagabas
+filepicker/  @bashbunni
 help/  @meowgorithm
 key/  @meowgorithm
 list/  @meowgorithm
-paginator/  @maaslalani
+paginator/  @meowgorithm
 progress/  @meowgorithm
 spinner/  @meowgorithm
-stopwatch/  @meowgorithm
-table/  @maaslalani
-textarea/  @maaslalani
+stopwatch/  @caarlos0
+table/  @aymanbagabas
+textarea/  @aymanbagabas
 textinput/  @meowgorithm
 viewport/  @meowgorithm