diff --git a/OWNERS b/OWNERS
index bfebe599c7..a7f8e939b5 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,7 +1,8 @@
 reviewers:
-  - sig-dev
+  - sig-backend
 approvers:
-  - sig-dev
+  - sig-backend
+  - sig-frontend
   - sig-release
 
 matches:
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 9b1f1bf04a..c8a24ac142 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -1,11 +1,10 @@
-sig-dev:
+sig-backend:
   users:
     - nghialv
-    - cakecatz
     - nakabonne
     - khanhtc1202
 
-sig-web:
+sig-frontend:
   users:
     - cakecatz
     - khanhtc1202
@@ -14,6 +13,7 @@ sig-web:
 sig-build:
   users:
     - nghialv
+    - khanhtc1202
 
 sig-release:
   users:
diff --git a/pkg/app/web/OWNERS b/pkg/app/web/OWNERS
index 6baa78c593..c8f62b8c10 100644
--- a/pkg/app/web/OWNERS
+++ b/pkg/app/web/OWNERS
@@ -1,8 +1,7 @@
 reviewers:
-  - sig-web
+  - sig-frontend
 approvers:
-  - sig-web
-  - sig-dev
+  - sig-frontend
 
 labels:
   - area/web