diff --git a/CODEOWNERS b/CODEOWNERS
index 0f8e886..6b00fb4 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -6,3 +6,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.
 * @chinaunicomyangfan @DanXu-ChinaTelecom @Kai-hw
+
+# 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 6d3d1f2..266ec8f 100644
--- a/MAINTAINERS.MD
+++ b/MAINTAINERS.MD
@@ -1,9 +1,9 @@
-| Org                    | Name            |
-| -----------------------|-----------------|
-| China Unicom | Fan Yang        |
-| China Unicom | Jing Hao        |
-| China Telecom | Dan Xu          |
-| China Mobile | Hanbai Wang     |
-| Huawei | Kai Zhang       |
-| Huawei | Shuting Qing    |
-| Ericsson | Thorsten Lohmar |
+| Org           | Name            | GitHub Username        |
+| --------------|-----------------|------------------------|
+| China Unicom  | Fan Yang        | chinaunicomyangfan |
+| China Unicom  | Jing Hao        | haoj24 |
+| China Telecom | Dan Xu          | DanXu-ChinaTelecom |
+| China Mobile  | Hanbai Wang     | HanbaiWang |
+| Huawei        | Kai Zhang       | Kai-hw |
+| Huawei        | Shuting Qing    | ShutingQing |
+| Ericsson      | Thorsten Lohmar | tlohmar |