diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6e47772c..6062f981 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,9 +1,11 @@
-# CODEOWNERS: https://help.github.com/articles/about-codeowners/
+# CODEOWNERS: <https://help.github.com/articles/about-codeowners/>
 
 # Primary repo maintainers
-*       @ilgooz @jeronimoalbi @Pantani @julienrbrt @Ehsan-saradar
+
+* @ilgooz @Pantani @julienrbrt
 
 # Docs
-*.md    @ilgooz
+
+*.md @Pantani @julienrbrt @toschdev
 
 LICENSE @ilgooz