diff --git a/OWNERS b/OWNERS
index 7dfe6c10f4be..2b5ccceaf513 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,12 +1,2 @@
-# The full list of approvers is defined in
-# https://android.googlesource.com/kernel/common/+/refs/meta/config/OWNERS
-
-# The following OWNERS are defined at the top level to improve the OWNERS
-# suggestions through any user interface. Consider those people the ones that
-# can help with finding the best person to review.
-adelva@google.com
-gregkh@google.com
-maennich@google.com
-saravanak@google.com
-surenb@google.com
-tkjos@google.com
+# include OWNERS from the authoritative android-mainline branch
+include kernel/common:android-mainline:/OWNERS
diff --git a/OWNERS_DrNo b/OWNERS_DrNo
deleted file mode 100644
index 5224e3f7ff17..000000000000
--- a/OWNERS_DrNo
+++ /dev/null
@@ -1,23 +0,0 @@
-# Authoritative list of Dr. No reviewers to approve changes on GKI release
-# branches, such as android12-5.10.
-#
-# This file has no effect in this branch, but is referred to from release
-# branches. So, please do not move or rename.
-#
-# See the GKI release documentation (go/gki-dr-no) for further details.
-
-# Main reviewers
-adelva@google.com
-maennich@google.com
-saravanak@google.com
-smuckle@google.com
-tkjos@google.com
-willdeacon@google.com
-
-# GKI Release Team
-howardsoc@google.com #{LAST_RESORT_SUGGESTION}
-szuweilin@google.com #{LAST_RESORT_SUGGESTION}
-
-# Backup
-sspatil@google.com #{LAST_RESORT_SUGGESTION}
-malchev@google.com #{LAST_RESORT_SUGGESTION}
diff --git a/android/OWNERS b/android/OWNERS
new file mode 100644
index 000000000000..3a9d87457d81
--- /dev/null
+++ b/android/OWNERS
@@ -0,0 +1,8 @@
+# If we ever add another OWNERS above this directory, it's likely to be
+# more permissive, so don't inherit from it
+set noparent
+include kernel/common:android-mainline:/OWNERS_DrNo
+
+# Downstream boards maintained directly in this manifest branch
+per-file abi_gki_aarch64_cuttlefish = adelva@google.com, rammuthiah@google.com
+per-file abi_gki_aarch64_goldfish = rkir@google.com
diff --git a/android/abi_gki_aarch64 b/android/abi_gki_aarch64
new file mode 100644
index 000000000000..57914f291962
--- /dev/null
+++ b/android/abi_gki_aarch64
@@ -0,0 +1,4 @@
+[abi_symbol_list]
+# commonly used symbols
+  module_layout
+  __put_task_struct
diff --git a/android/gki_aarch64_modules b/android/gki_aarch64_modules
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/build.config.common b/build.config.common
index 08dd1323144a..9a60b22f5899 100644
--- a/build.config.common
+++ b/build.config.common
@@ -1,4 +1,4 @@
-BRANCH=android-mainline
+BRANCH=android13-5.15
 KMI_GENERATION=0
 
 LLVM=1
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index 0a9066e8a8a7..961ef6fb2f6a 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -6,6 +6,13 @@ MAKE_GOALS="${MAKE_GOALS}
 Image.lz4
 "
 
+TIDY_ABI=1
+KMI_SYMBOL_LIST=android/abi_gki_aarch64
+
 FILES="${FILES}
 arch/arm64/boot/Image.lz4
 "
+
+TRIM_NONLISTED_KMI=${TRIM_NONLISTED_KMI:-1}
+KMI_SYMBOL_LIST_STRICT_MODE=${KMI_SYMBOL_LIST_STRICT_MODE:-1}
+MODULES_ORDER=android/gki_aarch64_modules