diff --git a/OWNERS b/OWNERS
index a5f7a8de..e8fb221a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,24 +1,13 @@
 approvers:
-- ciaranRoche
-- mbrudnoy
-- rafabene
-- rh-amarin
-
+- architecture-approvers
 reviewers:
-- aredenba-rh
-- ciaranRoche
-- crizzo71
-- jsell-rh
-- mbrudnoy
-- Mischulee
+- kuudori
 - pnguyen44
-- rafabene
-- rh-amarin
-- Ruclo
 - tirthct
-- vkareh
-- kuudori
-- ma-hill
 - ldornele
-- sherine-k
+- ma-hill
 - mliptak0
+- Ruclo
+- Mischulee
+labels:
+- area/architecture
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
new file mode 100644
index 00000000..0e1fdab4
--- /dev/null
+++ b/OWNERS_ALIASES
@@ -0,0 +1,61 @@
+aliases:
+  adapter-owners:
+  - rh-amarin
+  - rafabene
+  - kuudori
+  adapter-reviewers:
+  - Ruclo
+  - Mischulee
+  - mliptak0
+  - tirthct
+  api-owners:
+  - kuudori
+  - pnguyen44
+  api-reviewers:
+  - tirthct
+  - Mischulee
+  - ma-hill
+  - mliptak0
+  - ldornele
+  - rafabene
+  architecture-approvers:
+  - ciaranRoche
+  - mbrudnoy
+  - rafabene
+  - rh-amarin
+  broker-owners:
+  - rh-amarin
+  - kuudori
+  broker-reviewers:
+  - tirthct
+  - pnguyen44
+  - Mischulee
+  e2e-owners:
+  - kuudori
+  - ma-hill
+  e2e-reviewers:
+  - pnguyen44
+  - tirthct
+  - Mischulee
+  - mliptak0
+  release-owners:
+  - ma-hill
+  - kuudori
+  release-reviewers:
+  - tirthct
+  - Mischulee
+  sentinel-owners:
+  - pnguyen44
+  - kuudori
+  - rh-amarin
+  sentinel-reviewers:
+  - tirthct
+  - Ruclo
+  - ldornele
+  - mliptak0
+  tooling-owners:
+  - rafabene
+  - pnguyen44
+  tooling-reviewers:
+  - kuudori
+  - tirthct
diff --git a/hyperfleet/adrs/OWNERS b/hyperfleet/adrs/OWNERS
new file mode 100644
index 00000000..e0734946
--- /dev/null
+++ b/hyperfleet/adrs/OWNERS
@@ -0,0 +1,7 @@
+reviewers:
+- pnguyen44
+- kuudori
+- tirthct
+- ldornele
+labels:
+- kind/adr
diff --git a/hyperfleet/components/adapter/OWNERS b/hyperfleet/components/adapter/OWNERS
new file mode 100644
index 00000000..c4a58a3f
--- /dev/null
+++ b/hyperfleet/components/adapter/OWNERS
@@ -0,0 +1,5 @@
+reviewers:
+- adapter-owners
+- adapter-reviewers
+labels:
+- area/adapter
diff --git a/hyperfleet/components/api-service/OWNERS b/hyperfleet/components/api-service/OWNERS
new file mode 100644
index 00000000..60805515
--- /dev/null
+++ b/hyperfleet/components/api-service/OWNERS
@@ -0,0 +1,5 @@
+reviewers:
+- api-owners
+- api-reviewers
+labels:
+- area/api
diff --git a/hyperfleet/components/broker/OWNERS b/hyperfleet/components/broker/OWNERS
new file mode 100644
index 00000000..e65660f0
--- /dev/null
+++ b/hyperfleet/components/broker/OWNERS
@@ -0,0 +1,5 @@
+reviewers:
+- broker-owners
+- broker-reviewers
+labels:
+- area/broker
diff --git a/hyperfleet/components/claude-code-plugin/OWNERS b/hyperfleet/components/claude-code-plugin/OWNERS
new file mode 100644
index 00000000..55e41fe4
--- /dev/null
+++ b/hyperfleet/components/claude-code-plugin/OWNERS
@@ -0,0 +1,5 @@
+reviewers:
+- tooling-owners
+- tooling-reviewers
+labels:
+- area/tooling
diff --git a/hyperfleet/components/sentinel/OWNERS b/hyperfleet/components/sentinel/OWNERS
new file mode 100644
index 00000000..377b9115
--- /dev/null
+++ b/hyperfleet/components/sentinel/OWNERS
@@ -0,0 +1,5 @@
+reviewers:
+- sentinel-owners
+- sentinel-reviewers
+labels:
+- area/sentinel
diff --git a/hyperfleet/docs/e2e-testing/OWNERS b/hyperfleet/docs/e2e-testing/OWNERS
new file mode 100644
index 00000000..e2ad5e6b
--- /dev/null
+++ b/hyperfleet/docs/e2e-testing/OWNERS
@@ -0,0 +1,5 @@
+reviewers:
+- e2e-owners
+- e2e-reviewers
+labels:
+- area/e2e
diff --git a/hyperfleet/docs/release/OWNERS b/hyperfleet/docs/release/OWNERS
new file mode 100644
index 00000000..5ca68075
--- /dev/null
+++ b/hyperfleet/docs/release/OWNERS
@@ -0,0 +1,5 @@
+reviewers:
+- release-owners
+- release-reviewers
+labels:
+- area/release
diff --git a/hyperfleet/standards/OWNERS b/hyperfleet/standards/OWNERS
new file mode 100644
index 00000000..2c74f187
--- /dev/null
+++ b/hyperfleet/standards/OWNERS
@@ -0,0 +1,7 @@
+reviewers:
+- rafabene
+- kuudori
+- ldornele
+- pnguyen44
+labels:
+- kind/standard