diff --git a/CODEOWNERS b/CODEOWNERS
index fdb71ff..9edcbba 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -7,3 +7,7 @@
 # These are the default owners for the whole content of this repository. The default owners are automatically added as reviewers when you open a pull request, unless different owners are specified in the file.
 
 * @ToshiWakayama-KDDI @fernandopradocabrillo @GillesInnov35
+
+# Owners of the CODEOWNER and Maintainer.md files are the admins of CAMARA (to allow them to keep the teams within the CAMARA organization in sync in case of changes)
+/CODEOWNERS @camaraproject/admins
+/MAINTAINERS.MD @camaraproject/admins
diff --git a/MAINTAINERS.MD b/MAINTAINERS.MD
index fba6375..5d641ec 100644
--- a/MAINTAINERS.MD
+++ b/MAINTAINERS.MD
@@ -1,8 +1,8 @@
-| Org                    | Name                                                |
-| -----------------------| ----------------------------------------------------|
-| China Telecom | Dan Xu |
-| Deutsche Telekom | Efthymis Isaakidis |
-| KDDI | Tetsuya Chiba |
-| KDDI | Toshi Wakayama |
-| Orange | Gilles Renoux |
-| Telefonica | Fernando Prado |
+| Org                    | Name                     | GitHub Username           |
+| -----------------------| -------------------------|---------------------------|
+| China Telecom | Dan Xu | DanXu-ChinaTelecom |
+| Deutsche Telekom | Efthymis Isaakidis | EfthymisIsaakidis-DTCS |
+| KDDI | Tetsuya Chiba | tcchiba |
+| KDDI | Toshi Wakayama | ToshiWakayama-KDDI |
+| Orange | Gilles Renoux | GillesInnov35 |
+| Telefonica | Fernando Prado | fernandopradocabrillo |