diff --git a/CODEOWNERS b/CODEOWNERS
index 551ec6b..f73810e 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,13 +2,13 @@
 # responsible for code in a repository. For details, please refer to
 # https://docs.github.com/en/free-pro-team@latest/github/creating-cloning-and-archiving-repositories/about-code-owners
 
-* @cloudnative-pg/maintainers @NiccoloFei @GabriFedi97
+* @leonardoce @mnencia @gbartolini @fcanovai @armru @NiccoloFei @GabriFedi97
 
 # TimescaleDB (OSS version)
-/timescaledb-oss/ @shusaan @cloudnative-pg/maintainers @NiccoloFei
+/timescaledb-oss/ @shusaan
 
 # wal2json
-/wal2json/ @cloudnative-pg/maintainers @NiccoloFei @solidDoWant
+/wal2json/ @solidDoWant
 
 # pg-ivm
-/pg-ivm/ @shusaan @cloudnative-pg/maintainers @NiccoloFei
+/pg-ivm/ @shusaan