diff --git a/CODEOWNERS b/CODEOWNERS
index 5ee8a6d1..a46f4113 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -4,6 +4,7 @@
 # Default owners for everything in the repo
 * @josealekhine
 * @parlakisik
+* @hamzaerbay
 
 # Core CLI implementation
 /cmd/ @josealekhine