diff --git a/OWNERS b/OWNERS
index b88c622..f942d03 100644
--- a/OWNERS
+++ b/OWNERS
@@ -11,3 +11,8 @@
 pgervais@chromium.org
 rogerta@chromium.org
 stip@chromium.org
+
+per-file commit_queue.py=akuegel@chromium.org
+per-file commit_queue.py=phajdan.jr@chromium.org
+per-file commit_queue.py=sergiyb@chromium.org
+per-file commit_queue.py=tandrii@chromium.org
diff --git a/infra/config/OWNERS b/infra/config/OWNERS
index 4270d09..2aa95ea 100644
--- a/infra/config/OWNERS
+++ b/infra/config/OWNERS
@@ -1,3 +1,5 @@
 set noparent
-sergiyb@chromium.org
 akuegel@chromium.org
+phajdan.jr@chromium.org
+sergiyb@chromium.org
+tandrii@chromium.org
diff --git a/third_party/cq_client/OWNERS b/third_party/cq_client/OWNERS
new file mode 100644
index 0000000..aa2ee95
--- /dev/null
+++ b/third_party/cq_client/OWNERS
@@ -0,0 +1,4 @@
+akuegel@chromium.org
+phajdan.jr@chromium.org
+sergiyb@chromium.org
+tandrii@chromium.org