diff --git a/BUILD.bazel b/BUILD.bazel
index e2a937666cb4..ee89d7259832 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1234,11 +1234,13 @@ kernel_build(
     # Otherwise, Bazel thinks that there are no output files, and skip building.
     outs = [".config"],
     build_config = "build.config.allmodconfig.aarch64",
+    defconfig = "//build/kernel/kleaf:allmodconfig",
     make_goals = [
         "Image",
         "modules",
     ],
     makefile = ":Makefile",
+    post_defconfig_fragments = [":kmi/aarch64/defconfig/allmodconfig"],
     visibility = ["//visibility:private"],
 )
 
@@ -1251,11 +1253,13 @@ kernel_build(
     outs = [".config"],
     arch = "x86_64",
     build_config = "build.config.allmodconfig.x86_64",
+    defconfig = "//build/kernel/kleaf:allmodconfig",
     make_goals = [
         "bzImage",
         "modules",
     ],
     makefile = ":Makefile",
+    post_defconfig_fragments = [":kmi/x86_64/defconfig/allmodconfig"],
     visibility = ["//visibility:private"],
 )
 
@@ -1269,11 +1273,13 @@ kernel_build(
     outs = [".config"],
     arch = "arm",
     build_config = "build.config.allmodconfig.arm",
+    defconfig = "//build/kernel/kleaf:allmodconfig",
     make_goals = [
         "zImage",
         "modules",
     ],
     makefile = ":Makefile",
+    post_defconfig_fragments = [":kmi/arm/defconfig/allmodconfig"],
     visibility = ["//visibility:private"],
 )
 
diff --git a/build.config.allmodconfig b/build.config.allmodconfig
deleted file mode 100644
index e513d533f5ec..000000000000
--- a/build.config.allmodconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-DEFCONFIG=allmodconfig
-
-POST_DEFCONFIG_CMDS="update_config"
-function update_config() {
-    ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
-         -e UNWINDER_FRAME_POINTER \
-         -d WERROR \
-         -d SAMPLES \
-         -d BPFILTER \
-         -e RANDSTRUCT_NONE \
-         -d RANDSTRUCT_FULL \
-         -d RANDSTRUCT \
-         -d AF_RXRPC \
-         -d AFS_FS \
-         -d BUILTIN_MODULE_RANGES \
-
-    (cd ${OUT_DIR} && \
-     make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} ${TOOL_ARGS} ${MAKE_ARGS} olddefconfig)
-}
diff --git a/build.config.allmodconfig.aarch64 b/build.config.allmodconfig.aarch64
index 2fbe380e030a..5b4b75cc3adf 100644
--- a/build.config.allmodconfig.aarch64
+++ b/build.config.allmodconfig.aarch64
@@ -1,4 +1,3 @@
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig
 
diff --git a/build.config.allmodconfig.arm b/build.config.allmodconfig.arm
index e92744a9b518..bf3b1b4e40cd 100644
--- a/build.config.allmodconfig.arm
+++ b/build.config.allmodconfig.arm
@@ -1,4 +1,3 @@
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.arm
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig
 
diff --git a/build.config.allmodconfig.x86_64 b/build.config.allmodconfig.x86_64
index f06b30c8426f..f67e41d10288 100644
--- a/build.config.allmodconfig.x86_64
+++ b/build.config.allmodconfig.x86_64
@@ -1,4 +1,3 @@
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig
 
diff --git a/kmi/aarch64/defconfig/allmodconfig b/kmi/aarch64/defconfig/allmodconfig
new file mode 100644
index 000000000000..bf502c2385be
--- /dev/null
+++ b/kmi/aarch64/defconfig/allmodconfig
@@ -0,0 +1,9 @@
+# CONFIG_AFS_FS is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_BPFILTER is not set
+# CONFIG_BUILTIN_MODULE_RANGES is not set
+# CONFIG_RANDSTRUCT is not set
+# CONFIG_RANDSTRUCT_FULL is not set
+CONFIG_RANDSTRUCT_NONE=y
+# CONFIG_SAMPLES is not set
+# CONFIG_WERROR is not set
diff --git a/kmi/arm/defconfig/allmodconfig b/kmi/arm/defconfig/allmodconfig
new file mode 100644
index 000000000000..58b11b01ffce
--- /dev/null
+++ b/kmi/arm/defconfig/allmodconfig
@@ -0,0 +1,10 @@
+CONFIG_UNWINDER_FRAME_POINTER=y
+# CONFIG_AFS_FS is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_BPFILTER is not set
+# CONFIG_BUILTIN_MODULE_RANGES is not set
+# CONFIG_RANDSTRUCT is not set
+# CONFIG_RANDSTRUCT_FULL is not set
+CONFIG_RANDSTRUCT_NONE=y
+# CONFIG_SAMPLES is not set
+# CONFIG_WERROR is not set
diff --git a/kmi/x86_64/defconfig/allmodconfig b/kmi/x86_64/defconfig/allmodconfig
new file mode 100644
index 000000000000..58b11b01ffce
--- /dev/null
+++ b/kmi/x86_64/defconfig/allmodconfig
@@ -0,0 +1,10 @@
+CONFIG_UNWINDER_FRAME_POINTER=y
+# CONFIG_AFS_FS is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_BPFILTER is not set
+# CONFIG_BUILTIN_MODULE_RANGES is not set
+# CONFIG_RANDSTRUCT is not set
+# CONFIG_RANDSTRUCT_FULL is not set
+CONFIG_RANDSTRUCT_NONE=y
+# CONFIG_SAMPLES is not set
+# CONFIG_WERROR is not set