diff --git a/CODEOWNERS b/CODEOWNERS
index 297503c..0e7778b 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.
 * @PedroDiez @grgpapadopoulos @ksl4dtit
 
+# 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 6aa3d73..68954ff 100644
--- a/MAINTAINERS.MD
+++ b/MAINTAINERS.MD
@@ -1,4 +1,4 @@
-| Org                    | Name                                                |
-| -----------------------| ----------------------------------------------------|
-| Telefonica             | Pedro Diez Garcia                                   |
-| Deutsche Telekom       | Georgios Papadopoulos                               |
+| Org                    | Name                     | GitHub                   |
+| -----------------------| -------------------------| -------------------------|
+| Telefonica             | Pedro Diez Garcia        | PedroDiez                |
+| Deutsche Telekom       | Georgios Papadopoulos    | grgpapadopoulos          |