diff --git a/CODEOWNERS b/CODEOWNERS
index 15e7b3ec5f6..91dad5e4392 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,2 @@
-*       @sownak @suvajit-sarkar @adityajoshi12
+*       @sownak @suvajit-sarkar @adityajoshi12 @alvaropicazo
 
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index dba45e2001f..2a94b379182 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -9,6 +9,7 @@ This is the list of maintainers, including their github profiles for direct comm
 | Sownak Roy             | @sownak                  | Product vision, Architecture, Development   |
 | Suvajit Sarkar         | @suvajit-sarkar          | Product roadmap, Architecture, Development  |
 | Aditya Joshi           | @adityajoshi12           | Architecture, Development                   |
+| Alvaro Picazo          | @alvaropicazo            | Architecture, Development                   |
 
 ## Emeritus Maintainers