diff --git a/CODEOWNERS b/CODEOWNERS
index 6ca994a4c2..8cd0bf0796 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,7 +1 @@
-* @takeutak @izuru0 @jagpreetsinghsasan @vramakrishna @sandeepnRES @outSH @RafaelAPB @AndreAugusto11
-
-packages/cactus-plugin-satp-hermes @LordKubaya
-packages/cactus-plugin-bungee-hermes @LordKubaya
-examples/cactus-example-cbdc-bridging @LordKubaya
-examples/cactus-example-cbdc-bridging-backend @LordKubaya
-examples/cactus-example-cbdc-bridging-frontend @LordKubaya
\ No newline at end of file
+* @vramakrishna @sandeepnRES @outSH @RafaelAPB @AndreAugusto11 @LordKubaya
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index c74da802a1..32a472cecb 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -5,21 +5,19 @@ Maintainers
 
 | Name | GitHub | Chat |
 |------|--------|------|
-| Izuru Sato | [izuru0][izuru0] | izurusato |
-| Michal Bajer | [outSH][outSH] | - |
-| Takuma TAKEUCHI | [takeutak][takeutak] | takeutak |
+| Michal Bajer | [outSH][outSH] | bajerm |
 | Venkatraman Ramakrishna | [VRamakrishna][VRamakrishna] | vramaiitkgp |
 | Sandeep Nishad | [sandeepnRES][sandeepnRES] | sandeepn |
 | Rafael Belchior | [RafaelAPB][RafaelAPB] | rafaelapb |
 | André Augusto | [AndreAugusto11][AndreAugusto11] | andreaugusto |
+| Carlos Amaro | [LordKubaya][LordKubaya] | kubaya |
 
-[izuru0]: https://github.com/izuru0
 [outSH]: https://github.com/outSH
-[takeutak]: https://github.com/takeutak
 [VRamakrishna]: https://github.com/VRamakrishna
 [sandeepnRES]: https://github.com/sandeepnRES
 [RafaelAPB]: https://github.com/RafaelAPB
 [AndreAugusto11]: https://github.com/AndreAugusto11
+[LordKubaya]: https://github.com/LordKubaya
 
 **Emeritus Maintainers**
 
@@ -30,12 +28,17 @@ Maintainers
 | Dhinakaran Vinayagamurthy | [dhinakaran2705][dhinakaran2705] | Dhinakaran |
 | Jagpreet Singh Sasan | [jagpreetsinghsasan][jagpreetsinghsasan] | jagpreetsinghsasan |
 | Peter Somogyvari | [petermetz][petermetz] | peter_somogyvari |
+| Takuma TAKEUCHI | [takeutak][takeutak] | takeutak |
+| Izuru Sato | [izuru0][izuru0] | izurusato |
+
 
 [jonathan-m-hamilton]: https://github.com/jonathan-m-hamilton
 [knarayan]: https://github.com/knarayan
 [dhinakaran2705]: https://github.com/dhinakaran2705
 [jagpreetsinghsasan]: https://github.com/jagpreetsinghsasan
 [petermetz]: https://github.com/petermetz
+[takeutak]: https://github.com/takeutak
+[izuru0]: https://github.com/izuru0
 
 Below is a list of former contributors to the [Weaver Lab](https://github.com/hyperledger-labs/weaver-dlt-interoperability) project, which is now a part of Cacti.