diff --git a/core/java/android/os/image/OWNERS b/core/java/android/os/image/OWNERS
index 389b55bcf96ed..08a51ff0e7a77 100644
--- a/core/java/android/os/image/OWNERS
+++ b/core/java/android/os/image/OWNERS
@@ -1 +1,3 @@
+include /packages/DynamicSystemInstallationService/OWNERS
+
 andrewhsieh@google.com
diff --git a/packages/DynamicSystemInstallationService/OWNERS b/packages/DynamicSystemInstallationService/OWNERS
index 60910c432162c..c1b7ec461031e 100644
--- a/packages/DynamicSystemInstallationService/OWNERS
+++ b/packages/DynamicSystemInstallationService/OWNERS
@@ -1,3 +1,3 @@
-yochiang@google.com
 howardsoc@google.com
 pchsueh@google.com
+yochiang@google.com
diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS
index 85523f7593e16..a82e146113b68 100644
--- a/services/core/java/com/android/server/OWNERS
+++ b/services/core/java/com/android/server/OWNERS
@@ -23,6 +23,7 @@ per-file *Network* = file:/services/core/java/com/android/server/net/OWNERS
 per-file *Storage* = file:/core/java/android/os/storage/OWNERS
 per-file *TimeUpdate* = file:/core/java/android/app/timezone/OWNERS
 per-file ConnectivityService.java = file:/services/core/java/com/android/server/net/OWNERS
+per-file DynamicSystemService.java = file:/packages/DynamicSystemInstallationService/OWNERS
 per-file GestureLauncherService.java = file:platform/packages/apps/EmergencyInfo:/OWNERS
 per-file IpSecService.java = file:/services/core/java/com/android/server/net/OWNERS
 per-file MmsServiceBroker.java = file:/telephony/OWNERS