diff --git a/CODEOWNERS b/CODEOWNERS
index c8c9f97..535c2c9 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.
 
 * @gunjald @kevsy @crissancas @FabrizioMoggio @nicolacdnll @gainsley @javierlozallu
+
+# 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 57163a1..2388c04 100644
--- a/MAINTAINERS.MD
+++ b/MAINTAINERS.MD
@@ -1,8 +1,8 @@
-| Org                    | Name                                                |
-| -----------------------| ----------------------------------------------------|
-| 5GFF| Kevin Smith |
-| 5GFF | Mahesh Chapalamadugu |
-| Capgemini | Deepak Gunjal |
-| Telefonica | Cristina Santana Casillas |
-| EdgeXR | Jon Gainsley |
-| Orange | Frederic Fieau |
+| Org                    | Name                   | GitHub Username             |
+| -----------------------| -----------------------|-----------------------------|
+| 5GFF| Kevin Smith | Kevsy |  
+| 5GFF | Mahesh Chapalamadugu | maheshc01 |
+| Capgemini | Deepak Gunjal | deepakjaiswal1 |
+| Telefonica | Cristina Santana Casillas | crissancas |
+| EdgeXR | Jon Gainsley | gainsley |
+| Orange | Frederic Fieau | FredericFi |