diff --git a/OWNERS b/OWNERS
index 22efa33bf8..c2df914371 100644
--- a/OWNERS
+++ b/OWNERS
@@ -10,7 +10,6 @@ twickham@google.com
 vadimt@google.com
 winsonc@google.com
 jonmiranda@google.com
-awickham@google.com
 agvard@google.com
 
 # Launcher workspace eng team
@@ -46,6 +45,20 @@ helencheuk@google.com
 shamalip@google.com
 zakcohen@google.com
 
+## Note: some of the below overlap and also work on other integrations like Circle to Search.
+
+# All Apps / QSB team
+awickham@google.com
+brdayauon@google.com
+ganjam@google.com
+kylim@google.com
+
+# Smartspace team
+xilei@google.com
+davidct@google.com
+iamiam@google.com
+jiuyu@google.com
+
 per-file FeatureFlags.java, globs = set noparent
 per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com, captaincole@google.com