diff --git a/BUILD.bazel b/BUILD.bazel
index f31bfa4c1f8b..0685ddecc9e3 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -494,7 +494,9 @@ kernel_build(
     outs = [
         "Image",
     ],
-    build_config = "build.config.crashdump.aarch64",
+    arch = "arm64",
+    build_config = "build.config.common",
+    defconfig = "arch/arm64/configs/crashdump_defconfig",
     make_goals = [
         "Image",
     ],
@@ -521,7 +523,8 @@ kernel_build(
     srcs = [":kernel_x86_64_sources"],
     outs = X86_64_OUTS,
     arch = "x86_64",
-    build_config = "build.config.crashdump.x86_64",
+    build_config = "build.config.common",
+    defconfig = "arch/x86/configs/crashdump_defconfig",
     make_goals = [
         "bzImage",
     ],
diff --git a/build.config.crashdump b/build.config.crashdump
deleted file mode 100644
index 8a4214358308..000000000000
--- a/build.config.crashdump
+++ /dev/null
@@ -1 +0,0 @@
-DEFCONFIG=crashdump_defconfig
diff --git a/build.config.crashdump.aarch64 b/build.config.crashdump.aarch64
deleted file mode 100644
index 2d0d1000aa0b..000000000000
--- a/build.config.crashdump.aarch64
+++ /dev/null
@@ -1,6 +0,0 @@
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.crashdump
-
-# No modules
-IN_KERNEL_MODULES=
diff --git a/build.config.crashdump.x86_64 b/build.config.crashdump.x86_64
deleted file mode 100644
index 3737362fc290..000000000000
--- a/build.config.crashdump.x86_64
+++ /dev/null
@@ -1,6 +0,0 @@
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.crashdump
-
-# No modules
-IN_KERNEL_MODULES=