diff --git a/OWNERS b/OWNERS
index afaffae..002d594 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,37 +1,8 @@
 approvers:
-- aredenba-rh
-- ciaranRoche
-- crizzo71
-- jsell-rh
-- mbrudnoy
-- Mischulee
-- pnguyen44
-- rafabene
-- rh-amarin
-- Ruclo
-- tirthct
-- vkareh
-- kuudori
-- ma-hill
-- ldornele
-- sherine-k
-- mliptak0
-
+- infra-owners
+- tech-leads
 reviewers:
-- aredenba-rh
-- ciaranRoche
-- crizzo71
-- jsell-rh
-- mbrudnoy
-- Mischulee
-- pnguyen44
-- rafabene
-- rh-amarin
-- Ruclo
-- tirthct
-- vkareh
-- kuudori
-- ma-hill
-- ldornele
-- sherine-k
-- mliptak0
+- infra-reviewers
+- infra-owners
+labels:
+- area/infra
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
new file mode 100644
index 0000000..773b355
--- /dev/null
+++ b/OWNERS_ALIASES
@@ -0,0 +1,34 @@
+aliases:
+  e2e-owners:
+  - kuudori
+  - ma-hill
+  e2e-reviewers:
+  - pnguyen44
+  - tirthct
+  - Mischulee
+  - mliptak0
+  gateway-owners:
+  - mliptak0
+  - kuudori
+  gateway-reviewers:
+  - ldornele
+  - pnguyen44
+  infra-owners:
+  - ma-hill
+  - kuudori
+  - rafabene
+  infra-reviewers:
+  - mliptak0
+  - pnguyen44
+  - tirthct
+  oci-owners:
+  - rafabene
+  - ciaranRoche
+  oci-reviewers:
+  - pnguyen44
+  - ldornele
+  - Mischulee
+  tech-leads:
+  - ciaranRoche
+  - rafabene
+  - rh-amarin
diff --git a/functions/oci-ci-sweep/OWNERS b/functions/oci-ci-sweep/OWNERS
new file mode 100644
index 0000000..b2864ad
--- /dev/null
+++ b/functions/oci-ci-sweep/OWNERS
@@ -0,0 +1,7 @@
+approvers:
+- oci-owners
+reviewers:
+- oci-reviewers
+- oci-owners
+labels:
+- area/oci
diff --git a/helm/hyperfleet-gateway/OWNERS b/helm/hyperfleet-gateway/OWNERS
new file mode 100644
index 0000000..1a3353b
--- /dev/null
+++ b/helm/hyperfleet-gateway/OWNERS
@@ -0,0 +1,7 @@
+approvers:
+- gateway-owners
+reviewers:
+- gateway-reviewers
+- gateway-owners
+labels:
+- area/gateway
diff --git a/helm/mock-oidc/OWNERS b/helm/mock-oidc/OWNERS
new file mode 100644
index 0000000..1a3353b
--- /dev/null
+++ b/helm/mock-oidc/OWNERS
@@ -0,0 +1,7 @@
+approvers:
+- gateway-owners
+reviewers:
+- gateway-reviewers
+- gateway-owners
+labels:
+- area/gateway
diff --git a/helm/network-policies/OWNERS b/helm/network-policies/OWNERS
new file mode 100644
index 0000000..1a3353b
--- /dev/null
+++ b/helm/network-policies/OWNERS
@@ -0,0 +1,7 @@
+approvers:
+- gateway-owners
+reviewers:
+- gateway-reviewers
+- gateway-owners
+labels:
+- area/gateway
diff --git a/helmfile/OWNERS b/helmfile/OWNERS
new file mode 100644
index 0000000..dc2278b
--- /dev/null
+++ b/helmfile/OWNERS
@@ -0,0 +1,7 @@
+approvers:
+- e2e-owners
+reviewers:
+- e2e-reviewers
+- e2e-owners
+labels:
+- area/e2e
diff --git a/terraform/oci/OWNERS b/terraform/oci/OWNERS
new file mode 100644
index 0000000..b2864ad
--- /dev/null
+++ b/terraform/oci/OWNERS
@@ -0,0 +1,7 @@
+approvers:
+- oci-owners
+reviewers:
+- oci-reviewers
+- oci-owners
+labels:
+- area/oci