diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index c22e76c..a4a833b 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,16 +1,34 @@
+> [!Important]
+> Microcks governance, roles and policies are defined in the [GOVERNANCE](https://github.com/microcks/.github/blob/main/GOVERNANCE.md) file.
+> This MAINTAINERS file applies to every sub-project, repository and file existing within the [Microcks GitHub organization](https://github.com/microcks/).
+> Please keep the lists sorted in ascending alphabetical order.
+
 ## Overview
 
-This document provides an alphabetical list of Microcks' maintainers. 
-If you're interested in contributing and becoming a code owner, please refer to [CONTRIBUTING](CONTRIBUTING.md).
+This document provides an alphabetical list of Microcks' maintainers and code owners. If you want to contribute and become a maintainer or code owner, please refer to [CONTRIBUTING](CONTRIBUTING.md).
+
+## Maintainers
+
+The following members are Top-level [maintainers](https://github.com/microcks/.github/blob/main/GOVERNANCE.md#maintainers-code-owners-contributors-and-adopters) of the Microcks Parent Org, Parent Project, all repos, sub-repos, projects, sub-projects and forks contained within and under the entire Microcks parent org; with Full Binding Vote status.
 
-## Current Maintainers
+| Name | GitHub ID | Affiliation |
+|----------------------------------------------------------|--------------------------------------------------------------|-------------------|
+| Laurent Broudoux | [lbroudoux](https://github.com/lbroudoux) | Sponsored by Postman |
+| Yacine Kheddache | [yada](https://github.com/yada) | Sponsored by Postman |
 
-| Maintainer         | GitHub ID                                                 | Email                   |
-| ------------------ | --------------------------------------------------------- | ----------------------- |
-| Laurent Broudoux   | [lbroudoux](https://github.com/lbroudoux)                 | laurent@microcks.io     |
-| Yacine Kheddache   | [yada](https://github.com/yada)                           | yacine@microcks.io      |
+## Code Owners
+
+The following members are [code owners](https://github.com/microcks/.github/blob/main/GOVERNANCE.md#maintainers-code-owners-contributors-and-adopters) with specialized expertise in specific domains within the Microcks project. The domain may be a sub-project, repo or other responsibility as defined by the Maintainers.
+
+| Name | GitHub ID | Affiliation | Sub-Projects |
+|----------------------------------------------------------|-------------------------------------------------------------|-------------------|-------------------|
+| Hugo Guerrero | [hguerrero](https://github.com/hguerrero) | Kong (Ex Red Hat) | [Docker Desktop Extension](https://github.com/microcks/microcks-docker-desktop-extension) |
+| Julien Breux | [JulienBreux](https://github.com/JulienBreux) | Google | [Microcks CLI](https://github.com/microcks/microcks-cli) |
+| Sebastien DEGODEZ | [SebastienDegodez](https://github.com/SebastienDegodez) | AXA France | [Testcontainers .NET](https://github.com/microcks/microcks-testcontainers-dotnet) |
 
 ## Emeritus
 
-| Maintainer         | GitHub ID                                                 | Email                   |
-| ------------------ | --------------------------------------------------------- | ----------------------- |
\ No newline at end of file
+Below the list of Emeritus members are those who are no longer active but are recognized for their past contributions to the project.
+
+| Name | GitHub ID | Affiliation | Sub-Projects |
+|----------------------------------------------------------|-------------------------------------------------------------|-------------------|-------------------|