diff --git a/CODEOWNERS b/CODEOWNERS
index c7de18c..6796c98 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -7,3 +7,6 @@
 # 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.
 * @FabrizioMoggio @bigludo7 @chinaunicomyangfan
 
+# 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 d7c327b..f2a1ef9 100644
--- a/MAINTAINERS.MD
+++ b/MAINTAINERS.MD
@@ -1,5 +1,5 @@
-| Org                    | Name                                                |
-| -----------------------| ----------------------------------------------------|
-| TIM | Fabrizio Moggio |
-| Orange | Ludovic Robert |
-| China Unicom | F. Yang |
+| Org                    | Name                    | GitHub Username            |
+| -----------------------| ------------------------|----------------------------|
+| TIM | Fabrizio Moggio | FabrizioMoggio |
+| Orange | Ludovic Robert | bigludo7 |
+| China Unicom | F. Yang | chinaunicomyangfan |