diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b42e1c93d8f..17d7ef4d7a2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,7 +8,9 @@
 **/*asyncio*                  @1st1 @asvetlov
 
 # Core
+**/*context*                  @1st1
 **/*genobject*                @1st1
+**/*hamt*                     @1st1
 
 # Hashing
 **/*hashlib*                  @python/crypto-team