diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 08121a9a693b7..184c4a7f4a8c0 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -837,9 +837,9 @@ auto:
     env:
       # Disable RISCV target because building it OOMs.
       RUST_CONFIGURE_ARGS: >-
-        --build=i686-pc-windows-gnu
-        --enable-full-tools
-        --set llvm.targets=AArch64;AMDGPU;ARM;BPF;Hexagon;LoongArch;MSP430;Mips;NVPTX;PowerPC;Sparc;SystemZ;WebAssembly;X86
+        --build=x86_64-pc-windows-gnu
+        --target=i686-pc-windows-gnu
+        --set target.i686-pc-windows-gnu.linker=i686-w64-mingw32-gcc
       SCRIPT: python x.py dist bootstrap --include-default-paths
       DIST_REQUIRE_ALL_TOOLS: 1
       CODEGEN_BACKENDS: llvm,cranelift
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 470ef4ffea433..c0e151584878a 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -12,7 +12,15 @@ LLVM_MINGW_ARCHIVE_AARCH64="llvm-mingw-20251104-ucrt-aarch64.zip"
 LLVM_MINGW_ARCHIVE_X86_64="llvm-mingw-20251104-ucrt-x86_64.zip"
 
 if isWindows && isKnownToBeMingwBuild; then
-    case "${CI_JOB_NAME}" in
+    toolchains=
+    if [[ "${CI_JOB_NAME}" == *i686-mingw* ]]; then
+        toolchains=("${CI_JOB_NAME}" "x86_64-mingw")
+    else
+        toolchains=("${CI_JOB_NAME}")
+    fi
+
+    for toolchain in "${toolchains[@]}"; do
+        case "${toolchain}" in
         *aarch64-llvm*)
             mingw_dir="clangarm64"
             mingw_archive="${LLVM_MINGW_ARCHIVE_AARCH64}"
@@ -81,4 +89,5 @@ if isWindows && isKnownToBeMingwBuild; then
         # (see https://github.com/actions/runner-images/issues/12600)
         /c/msys64/usr/bin/bash -lc ' '
     fi
+    done
 fi