diff --git a/OWNERS b/OWNERS
index 6385475..13d22ce 100644
--- a/OWNERS
+++ b/OWNERS
@@ -73,3 +73,29 @@
 reviewers:
 - krzysztof.grobelny@intel.com
 - nanzhoumails@gmail.com
+
+matchers:
+# unit tests
+- suffix: _test.cpp
+  owners:
+      nanzhoumails@gmail.com
+
+# Redfish schemas
+- exact: redfish-core/lib/certificate_service.hpp
+      nanzhoumails@gmail.com
+- exact: redfish-core/lib/log_service.hpp
+      nanzhoumails@gmail.com
+- exact: redfish-core/lib/memory.hpp
+      nanzhoumails@gmail.com
+- exact: redfish-core/lib/sensors.hpp
+      nanzhoumails@gmail.com
+      krzysztof.grobelny@intel.com
+- exact: redfish-core/lib/event_service.hpp
+      krzysztof.grobelny@intel.com
+- exact: redfish-core/lib/power.hpp
+      krzysztof.grobelny@intel.com
+- exact: redfish-core/lib/thermal.hpp
+      krzysztof.grobelny@intel.com
+- exact: redfish-core/lib/virtual_media.hpp
+      krzysztof.grobelny@intel.com
+