diff --git a/CODEOWNERS b/CODEOWNERS
index 8ed922e..551ec6b 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,7 +2,7 @@
 # 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
+* @cloudnative-pg/maintainers @NiccoloFei @GabriFedi97
 
 # TimescaleDB (OSS version)
 /timescaledb-oss/ @shusaan @cloudnative-pg/maintainers @NiccoloFei