diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c89c43c918..862e09fc2c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,12 +4,17 @@
 # Adoption
 roles/adoption_osp_deploy @openstack-k8s-operators/adoption-core-reviewers
 
+# BGP
+roles/ci_gen_kustomize_values/templates/bgp @openstack-k8s-operators/bgp
+roles/ci_gen_kustomize_values/templates/bgp_dt01 @openstack-k8s-operators/bgp
+
 # Compliance
 roles/compliance @openstack-k8s-operators/security
 
 # 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
@@ -18,7 +23,11 @@ roles/os_must_gather @openstack-k8s-operators/must-gather
 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 @ciecierski @jparoly @jirimacku
@@ -28,6 +37,7 @@ roles/reportportal @jirimacku @dsariel @sdatko
 
 # Shiftstack
 roles/shiftstack @rlobillo @eurijon
+roles/ci_gen_kustomize_values/templates/shiftstack @rlobillo @eurijon
 
 # Storage
 roles/cifmw_block_device @openstack-k8s-operators/storage
@@ -42,6 +52,9 @@ roles/nat64_appliance @hjensas
 roles/ci_lvms_storage @fultonj @fmount @abays
 roles/ci_local_storage @fultonj @fmount @abays
 
+# Uni
+roles/ci_gen_kustomize_values/templates/uni* @openstack-k8s-operators/ciops
+
 # Update
 roles/update @openstack-k8s-operators/updates