diff --git a/CODEOWNERS b/CODEOWNERS
index 71b5e65f94..ab6d2257a4 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,8 +1,9 @@
 # Autoscaling
 /libs/vm_monitor/ @neondatabase/autoscaling
 
-# DevProd
-/.github/ @neondatabase/developer-productivity
+# DevProd & PerfCorr
+/.github/ @neondatabase/developer-productivity @neondatabase/performance-correctness
+/test_runner/	@neondatabase/performance-correctness
 
 # Compute
 /pgxn/ @neondatabase/compute