diff --git a/BUILD.bazel b/BUILD.bazel
index 885571722c52..f780ffd87460 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -19,8 +19,26 @@ package(
 
 load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels")
 
-# This uses android/abi_gki_aarch64* in kmi_configs. If the list of
-# glob(["android/abi_gki_aarch64*"]) differs from
-# KMI_SYMBOL_LIST + ADDITIONAL_KMI_SYMBOL_LISTS in build.config.gki.aarch64,
-# or TRIM_NONLISTED_KMI changes, override kmi_configs here.
-define_common_kernels()
+_aarch64_additional_kmi_symbol_lists = [
+    # keep sorted
+    "android/abi_gki_aarch64_core",
+    "android/abi_gki_aarch64_db845c",
+    "android/abi_gki_aarch64_fips140",
+    "android/abi_gki_aarch64_generic",
+    "android/abi_gki_aarch64_hikey960",
+    "android/abi_gki_aarch64_virtual_device",
+]
+
+define_common_kernels(target_configs = {
+    # Sync with build.config.gki.aarch64
+    "kernel_aarch64": {
+        "kmi_symbol_list": "android/abi_gki_aarch64",
+        "additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists,
+        "abi_definition": "android/abi_gki_aarch64.xml",
+    },
+    "kernel_aarch64_debug": {
+        "kmi_symbol_list": "android/abi_gki_aarch64",
+        "additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists,
+        "abi_definition": "android/abi_gki_aarch64.xml",
+    },
+})
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index 479bed504395..45f1caeb3ff6 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -7,9 +7,8 @@ Image.lz4
 Image.gz
 "
 
+# Sync with BUILD.bazel
 ABI_DEFINITION=android/abi_gki_aarch64.xml
-# Update BUILD.bazel, define_common_kernels() if the list differs from
-# android/abi_gki_aarch64* in the filesystem.
 KMI_SYMBOL_LIST=android/abi_gki_aarch64
 ADDITIONAL_KMI_SYMBOL_LISTS="
 android/abi_gki_aarch64_core