diff --git a/CODEOWNERS b/CODEOWNERS
index 1765c0f081178..efd9cf4b9eaf8 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -6,6 +6,15 @@
 # Fallback to committers group for areas that do not have code owners
 /** @prestodb/committers
 
+#####################################################################
+# Presto core
+
+# Presto analyzer and optimizer
+/presto-main/src/*/java/com/facebook/presto/sql @jaystarshot @prestodb/committers
+
+# Presto cost based optimizer framework
+/presto-main/src/*/java/com/facebook/presto/cost @jaystarshot @prestodb/committers
+
 #####################################################################
 # Prestissimo module
 /presto-native-execution @prestodb/team-velox
@@ -23,6 +32,9 @@
 # Ranger Hive plugin
 /presto-hive/**/com/facebook/presto/hive/security/ranger @agrawalreetika @prestodb/committers
 
+# Redis history based optimizer plugin
+/redis-hbo-provider @jaystarshot @prestodb/committers
+
 #####################################################################
 # Presto modules and libraries