From 3c224c4026f730c3fe61bed00e45e7161eb78a6a Mon Sep 17 00:00:00 2001
From: Laura Bailey <lbailey@redhat.com>
Date: Mon, 12 Oct 2026 19:34:02 +1000
Subject: [PATCH] Updating OWNERS file - OWNERS file now uses filters to assign
 one reviewer per group. - OWNERS_ALIASES file added so groups can be defined
 in one location.

---
 OWNERS         | 35 ++++++++++++++++++++++-------------
 OWNERS_ALIASES | 12 ++++++++++++
 2 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 OWNERS_ALIASES

diff --git a/OWNERS b/OWNERS
index fba832c49a..1a4966be8d 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,14 +1,23 @@
 # See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-approvers:
-  - beekhof
-  - dminnear-rh
-  - gaurav-nelson
-  - mbaldessari
-  - mhjacks
-options: {}
-reviewers:
-  - beekhof
-  - dminnear-rh
-  - gaurav-nelson
-  - mbaldessari
-  - mhjacks
+# Used in conjunction with the OWNERS_ALIASES file to ensure
+# that at least one person in each group reviews and approves
+# each pull request.
+filters:
+  ".*": # Technical SMEs
+    labels:
+      - needs-tech-review
+    approvers:
+      - tech-smes
+    reviewers:
+      - tech-smes
+    emeritus_approvers:
+      - beekhof       # 2026-04-01 ish
+  ".*": # Content SMEs
+    labels:
+      - needs-docs-review
+    reviewers:
+      - content-smes
+    approvers:
+      - content-smes
+    emeritus_approvers:
+      - gaurav-nelson   # 2026-09-30
\ No newline at end of file
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
new file mode 100644
index 0000000000..509f6d863d
--- /dev/null
+++ b/OWNERS_ALIASES
@@ -0,0 +1,12 @@
+# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
+# Used in conjunction with the OWNERS file
+aliases:
+  tech-smes:    # Technical reviewers and approvers
+    - mbaldessari
+    - darkdoc
+    - dminnear-rh
+    - mhjacks
+    - day0hero
+  content-smes: # Content reviewers and approvers
+    - laubai
+    - kquinn1204