diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass
index 0ea1ee111b..d5f1346637 100644
--- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass
+++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass
@@ -42,7 +42,7 @@ DEPEND="=sys-kernel/coreos-sources-${COREOS_SOURCE_VERSION}"
 RESTRICT="binchecks strip"
 
 # The build tools are OK and shouldn't trip up multilib-strict.
-QA_MULTILIB_PATHS="usr/lib/modules/.*/build/scripts/.*"
+QA_MULTILIB_PATHS="usr/lib/modules/.*/build/scripts/kconfig/.*"
 
 # Use source installed by coreos-sources
 # KERNEL_DIR must find the kernel source tree under /usr/src/linux-*-coreos,
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.82.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.82.ebuild
index d68540c22a..73c33b970e 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.82.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.82.ebuild
@@ -54,6 +54,14 @@ src_install() {
 	# Clean up the build tree
 	shred_keys
 	kmake clean
+
+	# TODO: ensure that fixdep and kbuild tools shipped inside the image
+	# are native (we previously shipped amd64 binaries on arm64).
+	# Upstream has a new script from v6.12 that we might be able to use:
+	# scripts/package/install-extmod-build
+	kmake HOSTLD=$(tc-getLD) HOSTCC=$(tc-getCC) cmd_and_fixdep='$(cmd)' modules_prepare
+	kmake clean
+
 	find "build/" -type d -empty -delete || die
 	rm "build/.config.old" || die