diff --git a/BUILD.bazel b/BUILD.bazel
index 51b1b0efe9b8..7c97450c7781 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -161,6 +161,7 @@ common_kernel(
     gki_boot_img_sizes = _GKI_AARCH64_BOOT_IMAGE_SIZES,
     gki_system_dlkm_modules = "android/gki_system_dlkm_modules_arm64",
     make_goals = _GKI_AARCH64_MAKE_GOALS,
+    makefile = ":Makefile",
     module_implicit_outs = get_gki_modules_list("arm64") + get_kunit_modules_list("arm64"),
     visibility = ["//visibility:public"],
 
@@ -192,6 +193,7 @@ common_kernel(
     gki_boot_img_sizes = _GKI_AARCH64_BOOT_IMAGE_SIZES,
     gki_system_dlkm_modules = "android/gki_system_dlkm_modules_arm64",
     make_goals = _GKI_AARCH64_MAKE_GOALS,
+    makefile = ":Makefile",
     module_implicit_outs = get_gki_modules_list("arm64") + get_kunit_modules_list("arm64"),
     page_size = "16k",
     visibility = ["//visibility:public"],
@@ -216,6 +218,7 @@ Consider building @@//common:kernel_aarch64 with:
     gki_boot_img_sizes = _GKI_AARCH64_BOOT_IMAGE_SIZES,
     gki_system_dlkm_modules = "android/gki_system_dlkm_modules_arm64",
     make_goals = _GKI_AARCH64_MAKE_GOALS,
+    makefile = ":Makefile",
     module_implicit_outs = get_gki_modules_list("arm64") + get_kunit_modules_list("arm64"),
     visibility = ["//visibility:public"],
 )
@@ -234,6 +237,7 @@ common_kernel(
     ],
     gki_system_dlkm_modules = "android/gki_system_dlkm_modules_arm64",
     make_goals = _GKI_AARCH64_MAKE_GOALS,
+    makefile = ":Makefile",
     module_implicit_outs = get_gki_modules_list("arm64") + get_kunit_modules_list("arm64"),
     visibility = ["//visibility:public"],
 )
@@ -256,6 +260,7 @@ Consider building @@//common:kernel_x86_64 with:
     gki_boot_img_sizes = _GKI_X86_64_BOOT_IMAGE_SIZES,
     gki_system_dlkm_modules = "android/gki_system_dlkm_modules_x86_64",
     make_goals = _GKI_X86_64_MAKE_GOALS,
+    makefile = ":Makefile",
     module_implicit_outs = get_gki_modules_list("x86_64") + get_kunit_modules_list("x86_64"),
     visibility = ["//visibility:public"],
 )
@@ -274,6 +279,7 @@ common_kernel(
     gki_boot_img_sizes = {"": "67108864"},
     gki_system_dlkm_modules = "android/gki_system_dlkm_modules_x86_64",
     make_goals = _GKI_X86_64_MAKE_GOALS,
+    makefile = ":Makefile",
     module_implicit_outs = get_gki_modules_list("x86_64") + get_kunit_modules_list("x86_64"),
     visibility = ["//visibility:public"],
 )
@@ -395,6 +401,7 @@ kernel_build(
     make_goals = [
         "Image",
     ],
+    makefile = ":Makefile",
 )
 
 copy_to_dist_dir(
@@ -418,6 +425,7 @@ kernel_build(
     make_goals = [
         "bzImage",
     ],
+    makefile = ":Makefile",
 )
 
 copy_to_dist_dir(
@@ -440,6 +448,7 @@ kernel_build(
     make_goals = [
         "Image",
     ],
+    makefile = ":Makefile",
 )
 
 copy_to_dist_dir(
@@ -461,6 +470,7 @@ kernel_build(
     make_goals = [
         "bzImage",
     ],
+    makefile = ":Makefile",
 )
 
 copy_to_dist_dir(
@@ -739,6 +749,7 @@ kernel_build(
         "qcom/sm8650-hdk.dtb",
         "qcom/sm8650-qrd.dtb",
     ],
+    makefile = ":Makefile",
     module_outs = _DB845C_MODULE_OUTS + _DB845C_WATCHDOG_MODULE_OUTS,
     strip_modules = True,
 )
@@ -770,6 +781,7 @@ kernel_build(
         "qcom/sm8650-hdk.dtb",
         "qcom/sm8650-qrd.dtb",
     ],
+    makefile = ":Makefile",
     module_outs = _DB845C_MODULE_OUTS,
     strip_modules = True,
 )
@@ -894,6 +906,7 @@ kernel_build(
         "modules",
         "rk3399-rock-pi-4b.dtb",
     ],
+    makefile = ":Makefile",
     module_outs = get_gki_modules_list("arm64") + get_kunit_modules_list("arm64") + _ROCKPI4_MODULE_OUTS + _ROCKPI4_WATCHDOG_MODULE_OUTS,
     visibility = ["//visibility:private"],
 )
@@ -918,6 +931,7 @@ kernel_build(
         "modules",
         "rk3399-rock-pi-4b.dtb",
     ],
+    makefile = ":Makefile",
     module_outs = get_gki_modules_list("arm64") + get_kunit_modules_list("arm64") + _ROCKPI4_MODULE_OUTS,
     visibility = ["//visibility:private"],
 )
@@ -971,6 +985,7 @@ kernel_build(
         "Image",
         "modules",
     ],
+    makefile = ":Makefile",
     visibility = ["//visibility:private"],
 )
 
@@ -987,6 +1002,7 @@ kernel_build(
         "bzImage",
         "modules",
     ],
+    makefile = ":Makefile",
     visibility = ["//visibility:private"],
 )
 
@@ -1004,6 +1020,7 @@ kernel_build(
         "zImage",
         "modules",
     ],
+    makefile = ":Makefile",
     visibility = ["//visibility:private"],
 )
 
@@ -2626,3 +2643,7 @@ pkg_zip(
     out = "test_mappings.zip",
     visibility = ["//visibility:public"],
 )
+
+exports_files([
+    "Makefile",
+])
diff --git a/build.config.crashdump.x86_64 b/build.config.crashdump.x86_64
index 18eed729a8c1..3737362fc290 100644
--- a/build.config.crashdump.x86_64
+++ b/build.config.crashdump.x86_64
@@ -1,4 +1,3 @@
-KERNEL_DIR=common
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.crashdump
diff --git a/build.config.microdroid.aarch64 b/build.config.microdroid.aarch64
index a8ffa55bc2ad..e1a5aaa40796 100644
--- a/build.config.microdroid.aarch64
+++ b/build.config.microdroid.aarch64
@@ -1,4 +1,3 @@
-KERNEL_DIR=common
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.microdroid
diff --git a/build.config.microdroid.x86_64 b/build.config.microdroid.x86_64
index 10cd8b23a748..f463009d91be 100644
--- a/build.config.microdroid.x86_64
+++ b/build.config.microdroid.x86_64
@@ -1,4 +1,3 @@
-KERNEL_DIR=common
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.microdroid