diff --git a/GOMA_OWNERS b/GOMA_OWNERS
new file mode 100644
index 000000000..72810679a
--- /dev/null
+++ b/GOMA_OWNERS
@@ -0,0 +1,4 @@
+sque@google.com
+ukai@google.com
+yekuang@google.com
+yyanagisawa@google.com
diff --git a/OWNERS b/OWNERS
index b1d5ca6ef..90d23c4ac 100644
--- a/OWNERS
+++ b/OWNERS
@@ -27,7 +27,7 @@ per-file cros=file://CROS_OWNERS
 per-file cros_sdk=file://CROS_OWNERS
 per-file repo=file://CROS_OWNERS
 
-# for goma client update
-per-file cipd_manifest.*=ukai@google.com
+# for the Goma client update
+per-file cipd_manifest.*=file://GOMA_OWNERS
 
 # COMPONENT: Infra>SDK