diff --git a/CODEOWNERS b/CODEOWNERS
index 4eae6d35245..f22a8c82652 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -10,9 +10,14 @@
 # Core utils
 /sdk/python/feast/infra/offline_stores/offline_utils.py @feast-dev/maintainers @sfc-gh-madkins
 
-# BigQuery
+# Offline interfaces
 /sdk/python/feast/infra/offline_stores/offline_store.py @feast-dev/maintainers
 
+# BigQuery
+/sdk/python/feast/infra/offline_stores/bigquery.py @sudohainguyen
+/sdk/python/feast/infra/offline_stores/bigquery_source.py @sudohainguyen
+/sdk/python/tests/integration/feature_repos/universal/data_sources/bigquery.py @sudohainguyen
+
 # Snowflake
 /sdk/python/feast/infra/offline_stores/snowflake* @sfc-gh-madkins
 
@@ -27,6 +32,9 @@
 
 # ==== Online Stores ====
 
+# HBase
+/sdk/python/feast/infra/online_stores/hbase.py @sudohainguyen
+
 # Redis
 /sdk/python/feast/infra/online_stores/redis.py @DvirDukhan
 /java/feast/serving/connectors/redis/ @DvirDukhan