diff --git a/config/OWNERS b/config/OWNERS
index d59c6f2d72ba6..001038d139c43 100644
--- a/config/OWNERS
+++ b/config/OWNERS
@@ -4,5 +4,11 @@ include /ZYGOTE_OWNERS
 
 per-file hiddenapi-* = andreionea@google.com, mathewi@google.com, satayev@google.com
 
+# art-team@ manages the boot image profiles
+per-file boot-* = calin@google.com, mathieuc@google.com, ngeoffray@google.com
+per-file dirty-image-objects = calin@google.com, mathieuc@google.com, ngeoffray@google.com
+per-file generate-preloaded-classes.sh = calin@google.com, mathieuc@google.com, ngeoffray@google.com
+per-file preloaded-classes* = calin@google.com, mathieuc@google.com, ngeoffray@google.com
+
 # Escalations:
 per-file hiddenapi-* = bdc@google.com, narayan@google.com
diff --git a/services/OWNERS b/services/OWNERS
index 88d0b61a2ab68..f1fa542fca00c 100644
--- a/services/OWNERS
+++ b/services/OWNERS
@@ -1 +1,4 @@
 per-file Android.bp = file:platform/build/soong:/OWNERS
+
+# art-team@ manages the system server profile
+per-file art-profile* = calin@google.com, mathieuc@google.com, ngeoffray@google.com