diff --git a/benchmarks/interpreter/OWNERS.toml b/benchmarks/interpreter/OWNERS.toml
new file mode 100644
index 0000000000..34cb11f338
--- /dev/null
+++ b/benchmarks/interpreter/OWNERS.toml
@@ -0,0 +1,6 @@
+[[rule]]
+files = "*"
+any = [
+    "francois.farquet@oracle.com",
+    "andrija.kolic@oracle.com",
+]
diff --git a/ci.jsonnet b/ci.jsonnet
index be1ba0296f..b642ed0813 100644
--- a/ci.jsonnet
+++ b/ci.jsonnet
@@ -5,7 +5,7 @@
 (import "ci/python-gate.libsonnet") +
 (import "ci/python-bench.libsonnet") +
 {
-    overlay: "a8df46e16d6fcae69e9a7c42c632131fdf6e043e",
+    overlay: "ed8f5da14a487e075631a90cf50e7dbca5d171aa",
     specVersion: "6",
     // Until buildbot issues around CI tiers are resolved, we cannot use them
     // tierConfig: self.tierConfig,
@@ -31,6 +31,7 @@
         RODINIA_DATASET_ZIP: "",
         BUILDBOT_COMMIT_SERVICE: "",
     },
+    codeowners_builds: [],
 
     local run_spec              = import "ci/graal/ci/ci_common/run-spec.libsonnet",
     local utils                 = import "ci/utils.libsonnet",
@@ -432,7 +433,7 @@
                 {'defined_in': std.thisFile} + b for b in self.processed_gate_builds.list + self.processed_bench_builds.list
             ])
         )
-    ) + [
+    ) + self.codeowners_builds + [
         {
             name: "graalpy-website-build",
             targets: ["tier1"],
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/OWNERS.toml b/graalpython/com.oracle.graal.python.benchmarks/python/micro/OWNERS.toml
new file mode 100644
index 0000000000..2391c4eadd
--- /dev/null
+++ b/graalpython/com.oracle.graal.python.benchmarks/python/micro/OWNERS.toml
@@ -0,0 +1,6 @@
+[[rule]]
+files = "arith-binop.py arith-modulo-sized.py attribute-access.py attribute-access-polymorphic.py attribute-access-super.py attribute-bool.py boolean-logic-sized.py builtin-len.py builtin-len-tuple-sized.py call-classmethod-sized.py call-method-polymorphic.py bytecode-benchmark.py for-range.py generate-functions-sized.py c-arith-binop.py c-arith-binop2.py c-call-classmethod.py c-call-method-int-float.py c-call-method.py c-instantiate-large.py c-issubtype-monorphic.py c-issubtype-polymorphic.py c-list-iterating-obj.py c-magic-bool.py c-magic-iter.py c-member-access.py"
+any = [
+    "francois.farquet@oracle.com",
+    "andrija.kolic@oracle.com",
+]
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/numpy/OWNERS.toml b/graalpython/com.oracle.graal.python.benchmarks/python/micro/numpy/OWNERS.toml
new file mode 100644
index 0000000000..34cb11f338
--- /dev/null
+++ b/graalpython/com.oracle.graal.python.benchmarks/python/micro/numpy/OWNERS.toml
@@ -0,0 +1,6 @@
+[[rule]]
+files = "*"
+any = [
+    "francois.farquet@oracle.com",
+    "andrija.kolic@oracle.com",
+]
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/pyperformance/OWNERS.toml b/graalpython/com.oracle.graal.python.benchmarks/python/micro/pyperformance/OWNERS.toml
new file mode 100644
index 0000000000..34cb11f338
--- /dev/null
+++ b/graalpython/com.oracle.graal.python.benchmarks/python/micro/pyperformance/OWNERS.toml
@@ -0,0 +1,6 @@
+[[rule]]
+files = "*"
+any = [
+    "francois.farquet@oracle.com",
+    "andrija.kolic@oracle.com",
+]