diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
deleted file mode 100644
index 69528e8532..0000000000
--- a/.github/CODEOWNERS
+++ /dev/null
@@ -1,70 +0,0 @@
-# Default code owners
-* @openstack-k8s-operators/cifmw-squad
-
-# Adoption
-roles/adoption_osp_deploy @openstack-k8s-operators/adoption-core-reviewers
-
-# BGP
-roles/ci_gen_kustomize_values/templates/bgp_dt01 @openstack-k8s-operators/bgp
-roles/ci_gen_kustomize_values/templates/bgp-l3-xl @openstack-k8s-operators/bgp
-playbooks/bgp @openstack-k8s-operators/bgp
-scenarios/reproducers/bgp-l3-xl.yml @openstack-k8s-operators/bgp
-
-# DCN
-roles/ci_dcn_site @openstack-k8s-operators/dcn
-playbooks/dcn.yml @openstack-k8s-operators/dcn
-roles/ci_gen_kustomize_values/templates/dcn @openstack-k8s-operators/dcn
-
-# Must gather
-roles/os_must_gather @openstack-k8s-operators/must-gather
-
-# NFV
-roles/idrac_configuration @openstack-k8s-operators/nfv
-roles/switch_config @openstack-k8s-operators/nfv
-roles/tofu @eshulman2 @openstack-k8s-operators/nfv
-roles/ci_gen_kustomize_values/templates/nfv-ovs-dpdk-sriov-hci @openstack-k8s-operators/nfv
-roles/ci_gen_kustomize_values/templates/ovs-dpdk @openstack-k8s-operators/nfv
-roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov @openstack-k8s-operators/nfv
-roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets @openstack-k8s-operators/nfv
-roles/ci_gen_kustomize_values/templates/sriov @openstack-k8s-operators/nfv
-
-# Polarion
-roles/polarion @tosky @jparoly @jirimacku
-
-# Report portal
-roles/reportportal @jirimacku @dsariel @sdatko
-
-# Security
-roles/compliance @openstack-k8s-operators/security
-roles/federation @openstack-k8s-operators/security
-roles/ipa @openstack-k8s-operators/security
-
-# Shiftstack
-roles/shiftstack @imatza-rh @eurijon
-roles/ci_gen_kustomize_values/templates/shiftstack @imatza-rh @eurijon
-
-# Storage
-roles/cifmw_block_device @openstack-k8s-operators/storage
-roles/cifmw_ceph_client @openstack-k8s-operators/storage
-roles/cifmw_ceph_spec @openstack-k8s-operators/storage
-roles/cifmw_cephadm @openstack-k8s-operators/storage
-roles/cifmw_create_admin @openstack-k8s-operators/storage
-playbooks/ceph.yml @openstack-k8s-operators/storage
-
-# Storage
-roles/nat64_appliance @hjensas
-roles/ci_lvms_storage @fultonj @fmount @abays
-roles/ci_local_storage @fultonj @fmount @abays
-
-# Test
-roles/tempest @openstack-k8s-operators/ciops
-roles/test_operator @openstack-k8s-operators/ciops
-
-# Uni
-roles/ci_gen_kustomize_values/templates/uni* @openstack-k8s-operators/ciops
-
-# Update
-roles/update @openstack-k8s-operators/updates
-
-# Validations
-roles/validations @drosenfe
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000000..86587d86fd
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - cifmw-squad
+
+reviewers:
+  - cifmw-squad
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
new file mode 100644
index 0000000000..141e212cce
--- /dev/null
+++ b/OWNERS_ALIASES
@@ -0,0 +1,119 @@
+# See the OWNERS_ALIASES docs: https://git.k8s.io/community/contributors/guide/owners.md#owners_aliases
+
+aliases:
+  cifmw-squad:
+    - rebtoor
+    - fultonj
+    - dasm
+    - danpawlik
+    - Valkyrie00
+    - yorabl
+    - tosky
+    - eshulman2
+    - evallesp
+    - bshewale
+    - amartyasinha
+    - brjackma
+    - michburk
+
+  adoption-team:
+    - sathlan
+    - jistr
+    - holser
+    - ciecierski
+    - pinikomarov
+    - klgill
+    - archana203
+
+  bgp-team:
+    - lmiccini
+    - ccamposr
+    - eduolivares
+    - frenzyfriday
+
+  dcn-team:
+    - fultonj
+    - jokke-ilujo
+
+  must-gather-team:
+    - dprince
+    - olliewalsh
+    - gibizer
+    - fmount
+    - abays
+    - pkomarov
+    - juliakreger
+    - Akrog
+    - stuggi
+
+  nfv-team:
+    - saneax
+    - atyronesmith
+    - eshulman2
+    - mnietoji
+    - rdiazcam
+
+  security-team:
+    - xek
+    - d34dh0r53
+    - dmendiza
+    - pkomarov
+    - vakwetu
+    - mauricioharley
+    - afaranha
+    - Deydra71
+
+  storage-team:
+    - eharney
+    - fultonj
+    - fmount
+    - gfidente
+    - cschwede
+    - Akrog
+    - gouthampacha
+    - tosky
+    - ASBishop
+    - silvacarloss
+    - konan-abhi
+
+  ciops-team:
+    - arxcruz
+    - dasm
+    - sdatko
+    - adrianfusco
+    - pojadhav
+    - kstrenkova
+    - imatza-rh
+    - sauragar
+    - belolipa
+
+  updates-team:
+    - sathlan
+    - jistr
+    - holser
+    - ciecierski
+    - pinikomarov
+    - archana203
+
+  # Individual contributor groups (already expanded)
+  shiftstack-team:
+    - imatza-rh
+    - eurijon
+
+  polarion-team:
+    - tosky
+    - jparoly
+    - jirimacku
+
+  reportportal-team:
+    - jirimacku
+    - dsariel
+    - sdatko
+
+  storage-contributors:
+    - fultonj
+    - fmount
+    - abays
+
+  tofu-owners:
+    - eshulman2
diff --git a/playbooks/bgp/OWNERS b/playbooks/bgp/OWNERS
new file mode 100644
index 0000000000..6839704e67
--- /dev/null
+++ b/playbooks/bgp/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - bgp-team
+
+reviewers:
+  - bgp-team
diff --git a/playbooks/ceph/OWNERS b/playbooks/ceph/OWNERS
new file mode 100644
index 0000000000..d5b92d8587
--- /dev/null
+++ b/playbooks/ceph/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - storage-team
+
+reviewers:
+  - storage-team
diff --git a/playbooks/dcn/OWNERS b/playbooks/dcn/OWNERS
new file mode 100644
index 0000000000..8366991fc2
--- /dev/null
+++ b/playbooks/dcn/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - dcn-team
+
+reviewers:
+  - dcn-team
diff --git a/roles/adoption_osp_deploy/OWNERS b/roles/adoption_osp_deploy/OWNERS
new file mode 100644
index 0000000000..91d325c37a
--- /dev/null
+++ b/roles/adoption_osp_deploy/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - adoption-team
+
+reviewers:
+  - adoption-team
diff --git a/roles/ci_dcn_site/OWNERS b/roles/ci_dcn_site/OWNERS
new file mode 100644
index 0000000000..8366991fc2
--- /dev/null
+++ b/roles/ci_dcn_site/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - dcn-team
+
+reviewers:
+  - dcn-team
diff --git a/roles/ci_gen_kustomize_values/templates/bgp-l3-xl/OWNERS b/roles/ci_gen_kustomize_values/templates/bgp-l3-xl/OWNERS
new file mode 100644
index 0000000000..6839704e67
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/bgp-l3-xl/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - bgp-team
+
+reviewers:
+  - bgp-team
diff --git a/roles/ci_gen_kustomize_values/templates/bgp_dt01/OWNERS b/roles/ci_gen_kustomize_values/templates/bgp_dt01/OWNERS
new file mode 100644
index 0000000000..6839704e67
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/bgp_dt01/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - bgp-team
+
+reviewers:
+  - bgp-team
diff --git a/roles/ci_gen_kustomize_values/templates/dcn/OWNERS b/roles/ci_gen_kustomize_values/templates/dcn/OWNERS
new file mode 100644
index 0000000000..8366991fc2
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/dcn/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - dcn-team
+
+reviewers:
+  - dcn-team
diff --git a/roles/ci_gen_kustomize_values/templates/nfv-ovs-dpdk-sriov-hci/OWNERS b/roles/ci_gen_kustomize_values/templates/nfv-ovs-dpdk-sriov-hci/OWNERS
new file mode 100644
index 0000000000..7a15ba5da1
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/nfv-ovs-dpdk-sriov-hci/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - nfv-team
+
+reviewers:
+  - nfv-team
diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/OWNERS b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/OWNERS
new file mode 100644
index 0000000000..7a15ba5da1
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - nfv-team
+
+reviewers:
+  - nfv-team
diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/OWNERS b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/OWNERS
new file mode 100644
index 0000000000..7a15ba5da1
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - nfv-team
+
+reviewers:
+  - nfv-team
diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk/OWNERS b/roles/ci_gen_kustomize_values/templates/ovs-dpdk/OWNERS
new file mode 100644
index 0000000000..7a15ba5da1
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - nfv-team
+
+reviewers:
+  - nfv-team
diff --git a/roles/ci_gen_kustomize_values/templates/shiftstack/OWNERS b/roles/ci_gen_kustomize_values/templates/shiftstack/OWNERS
new file mode 100644
index 0000000000..a081fc3e4f
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/shiftstack/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - shiftstack-team
+
+reviewers:
+  - shiftstack-team
diff --git a/roles/ci_gen_kustomize_values/templates/sriov/OWNERS b/roles/ci_gen_kustomize_values/templates/sriov/OWNERS
new file mode 100644
index 0000000000..7a15ba5da1
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/sriov/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - nfv-team
+
+reviewers:
+  - nfv-team
diff --git a/roles/ci_gen_kustomize_values/templates/uni01alpha-adoption/OWNERS b/roles/ci_gen_kustomize_values/templates/uni01alpha-adoption/OWNERS
new file mode 100644
index 0000000000..b7883e567d
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/uni01alpha-adoption/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - ciops-team
+
+reviewers:
+  - ciops-team
diff --git a/roles/ci_gen_kustomize_values/templates/uni01alpha/OWNERS b/roles/ci_gen_kustomize_values/templates/uni01alpha/OWNERS
new file mode 100644
index 0000000000..b7883e567d
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/uni01alpha/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - ciops-team
+
+reviewers:
+  - ciops-team
diff --git a/roles/ci_gen_kustomize_values/templates/uni02beta-adoption/OWNERS b/roles/ci_gen_kustomize_values/templates/uni02beta-adoption/OWNERS
new file mode 100644
index 0000000000..b7883e567d
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/uni02beta-adoption/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - ciops-team
+
+reviewers:
+  - ciops-team
diff --git a/roles/ci_gen_kustomize_values/templates/uni02beta/OWNERS b/roles/ci_gen_kustomize_values/templates/uni02beta/OWNERS
new file mode 100644
index 0000000000..b7883e567d
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/uni02beta/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - ciops-team
+
+reviewers:
+  - ciops-team
diff --git a/roles/ci_gen_kustomize_values/templates/uni04delta-ipv6-adoption/OWNERS b/roles/ci_gen_kustomize_values/templates/uni04delta-ipv6-adoption/OWNERS
new file mode 100644
index 0000000000..b7883e567d
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/uni04delta-ipv6-adoption/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - ciops-team
+
+reviewers:
+  - ciops-team
diff --git a/roles/ci_gen_kustomize_values/templates/uni04delta-ipv6/OWNERS b/roles/ci_gen_kustomize_values/templates/uni04delta-ipv6/OWNERS
new file mode 100644
index 0000000000..b7883e567d
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/uni04delta-ipv6/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - ciops-team
+
+reviewers:
+  - ciops-team
diff --git a/roles/ci_gen_kustomize_values/templates/uni05epsilon/OWNERS b/roles/ci_gen_kustomize_values/templates/uni05epsilon/OWNERS
new file mode 100644
index 0000000000..b7883e567d
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/uni05epsilon/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - ciops-team
+
+reviewers:
+  - ciops-team
diff --git a/roles/ci_gen_kustomize_values/templates/uni06zeta/OWNERS b/roles/ci_gen_kustomize_values/templates/uni06zeta/OWNERS
new file mode 100644
index 0000000000..b7883e567d
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/uni06zeta/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - ciops-team
+
+reviewers:
+  - ciops-team
diff --git a/roles/ci_gen_kustomize_values/templates/uni07eta/OWNERS b/roles/ci_gen_kustomize_values/templates/uni07eta/OWNERS
new file mode 100644
index 0000000000..b7883e567d
--- /dev/null
+++ b/roles/ci_gen_kustomize_values/templates/uni07eta/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - ciops-team
+
+reviewers:
+  - ciops-team
diff --git a/roles/ci_local_storage/OWNERS b/roles/ci_local_storage/OWNERS
new file mode 100644
index 0000000000..5c927dbf65
--- /dev/null
+++ b/roles/ci_local_storage/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - storage-contributors
+
+reviewers:
+  - storage-contributors
diff --git a/roles/ci_lvms_storage/OWNERS b/roles/ci_lvms_storage/OWNERS
new file mode 100644
index 0000000000..5c927dbf65
--- /dev/null
+++ b/roles/ci_lvms_storage/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - storage-contributors
+
+reviewers:
+  - storage-contributors
diff --git a/roles/cifmw_block_device/OWNERS b/roles/cifmw_block_device/OWNERS
new file mode 100644
index 0000000000..d5b92d8587
--- /dev/null
+++ b/roles/cifmw_block_device/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - storage-team
+
+reviewers:
+  - storage-team
diff --git a/roles/cifmw_ceph_client/OWNERS b/roles/cifmw_ceph_client/OWNERS
new file mode 100644
index 0000000000..d5b92d8587
--- /dev/null
+++ b/roles/cifmw_ceph_client/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - storage-team
+
+reviewers:
+  - storage-team
diff --git a/roles/cifmw_ceph_spec/OWNERS b/roles/cifmw_ceph_spec/OWNERS
new file mode 100644
index 0000000000..d5b92d8587
--- /dev/null
+++ b/roles/cifmw_ceph_spec/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - storage-team
+
+reviewers:
+  - storage-team
diff --git a/roles/cifmw_cephadm/OWNERS b/roles/cifmw_cephadm/OWNERS
new file mode 100644
index 0000000000..d5b92d8587
--- /dev/null
+++ b/roles/cifmw_cephadm/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - storage-team
+
+reviewers:
+  - storage-team
diff --git a/roles/cifmw_create_admin/OWNERS b/roles/cifmw_create_admin/OWNERS
new file mode 100644
index 0000000000..d5b92d8587
--- /dev/null
+++ b/roles/cifmw_create_admin/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - storage-team
+
+reviewers:
+  - storage-team
diff --git a/roles/compliance/OWNERS b/roles/compliance/OWNERS
new file mode 100644
index 0000000000..e74ebe3069
--- /dev/null
+++ b/roles/compliance/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - security-team
+
+reviewers:
+  - security-team
diff --git a/roles/federation/OWNERS b/roles/federation/OWNERS
new file mode 100644
index 0000000000..e74ebe3069
--- /dev/null
+++ b/roles/federation/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - security-team
+
+reviewers:
+  - security-team
diff --git a/roles/idrac_configuration/OWNERS b/roles/idrac_configuration/OWNERS
new file mode 100644
index 0000000000..7a15ba5da1
--- /dev/null
+++ b/roles/idrac_configuration/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - nfv-team
+
+reviewers:
+  - nfv-team
diff --git a/roles/ipa/OWNERS b/roles/ipa/OWNERS
new file mode 100644
index 0000000000..e74ebe3069
--- /dev/null
+++ b/roles/ipa/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - security-team
+
+reviewers:
+  - security-team
diff --git a/roles/nat64_appliance/OWNERS b/roles/nat64_appliance/OWNERS
new file mode 100644
index 0000000000..6d371edddc
--- /dev/null
+++ b/roles/nat64_appliance/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - hjensas  # Individual contributor
+
+reviewers:
+  - hjensas
diff --git a/roles/os_must_gather/OWNERS b/roles/os_must_gather/OWNERS
new file mode 100644
index 0000000000..2ca6683f8d
--- /dev/null
+++ b/roles/os_must_gather/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - must-gather-team
+
+reviewers:
+  - must-gather-team
diff --git a/roles/polarion/OWNERS b/roles/polarion/OWNERS
new file mode 100644
index 0000000000..69b6010616
--- /dev/null
+++ b/roles/polarion/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - polarion-team
+
+reviewers:
+  - polarion-team
diff --git a/roles/reportportal/OWNERS b/roles/reportportal/OWNERS
new file mode 100644
index 0000000000..02382fd168
--- /dev/null
+++ b/roles/reportportal/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - reportportal-team
+
+reviewers:
+  - reportportal-team
diff --git a/roles/shiftstack/OWNERS b/roles/shiftstack/OWNERS
new file mode 100644
index 0000000000..a081fc3e4f
--- /dev/null
+++ b/roles/shiftstack/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - shiftstack-team
+
+reviewers:
+  - shiftstack-team
diff --git a/roles/switch_config/OWNERS b/roles/switch_config/OWNERS
new file mode 100644
index 0000000000..7a15ba5da1
--- /dev/null
+++ b/roles/switch_config/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - nfv-team
+
+reviewers:
+  - nfv-team
diff --git a/roles/tempest/OWNERS b/roles/tempest/OWNERS
new file mode 100644
index 0000000000..b7883e567d
--- /dev/null
+++ b/roles/tempest/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - ciops-team
+
+reviewers:
+  - ciops-team
diff --git a/roles/test_operator/OWNERS b/roles/test_operator/OWNERS
new file mode 100644
index 0000000000..b7883e567d
--- /dev/null
+++ b/roles/test_operator/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - ciops-team
+
+reviewers:
+  - ciops-team
diff --git a/roles/tofu/OWNERS b/roles/tofu/OWNERS
new file mode 100644
index 0000000000..1a0f05f412
--- /dev/null
+++ b/roles/tofu/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - tofu-owners
+
+reviewers:
+  - tofu-owners
diff --git a/roles/update/OWNERS b/roles/update/OWNERS
new file mode 100644
index 0000000000..5194dfd104
--- /dev/null
+++ b/roles/update/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - updates-team
+
+reviewers:
+  - updates-team
diff --git a/roles/validations/OWNERS b/roles/validations/OWNERS
new file mode 100644
index 0000000000..604f4ecc3f
--- /dev/null
+++ b/roles/validations/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - drosenfe  # Individual contributor
+
+reviewers:
+  - drosenfe
diff --git a/scenarios/reproducers/bgp-l3-xl/OWNERS b/scenarios/reproducers/bgp-l3-xl/OWNERS
new file mode 100644
index 0000000000..6839704e67
--- /dev/null
+++ b/scenarios/reproducers/bgp-l3-xl/OWNERS
@@ -0,0 +1,7 @@
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
+
+approvers:
+  - bgp-team
+
+reviewers:
+  - bgp-team
diff --git a/scripts/check_k8s_snippets_comment.sh b/scripts/check_k8s_snippets_comment.sh
index 4d6642152c..5bc8063b54 100755
--- a/scripts/check_k8s_snippets_comment.sh
+++ b/scripts/check_k8s_snippets_comment.sh
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -o pipefail
 
 exit_code=0
 
-missing_comment=$(grep -rL '^# source: ' roles/ci_gen_kustomize_values/templates)
+missing_comment=$(grep -rL --exclude="OWNERS" '^# source: ' roles/ci_gen_kustomize_values/templates)
 if [[ $missing_comment != '' ]]; then
     echo "!! Following templates are missing the needed '# source: path/to/template' comment."
     echo "   Path must be relative to 'templates'"
@@ -13,13 +13,13 @@ if [[ $missing_comment != '' ]]; then
     let "exit_code+=1"
 fi
 
-set_path=$(grep -r '^# source: ' roles/ci_gen_kustomize_values/templates | sed 's!roles/ci_gen_kustomize_values/templates/!!')
+set_path=$(grep -r --exclude="OWNERS" '^# source: ' roles/ci_gen_kustomize_values/templates | sed 's!roles/ci_gen_kustomize_values/templates/!!')
 while read match; do
-    tmpl=$(echo -n "${match}" | cut -d ':' -f 1)
-    comment=$(echo -n "${match}" | cut -d ':' -f 3 | tr -d '[:space:]')
+    tmpl=$(echo "${match}" | cut -d ':' -f 1)
+    comment=$(echo "${match}" | cut -d ':' -f 3 | tr -d '[:space:]')
     if [[ "${tmpl}" != "${comment}" ]]; then
         let "exit_code+=1"
         echo "${tmpl} doesn't have correct 'source': ${comment}"
     fi
-done <<< ${set_path}
+done <<< "${set_path}"
 exit $exit_code