diff --git a/src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/Dockerfile b/src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/Dockerfile
new file mode 100644
index 0000000000000..3a46d3c5f9262
--- /dev/null
+++ b/src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/Dockerfile
@@ -0,0 +1,47 @@
+FROM ubuntu:22.04
+
+WORKDIR /build
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ca-certificates \
+    cmake \
+    curl \
+    g++ \
+    git \
+    make \
+    ninja-build \
+    python3 \
+    xz-utils
+
+COPY host-x86_64/dist-aarch64-windows-gnullvm/install-llvm-mingw.sh /build
+RUN ./install-llvm-mingw.sh
+
+COPY scripts/sccache.sh /scripts/
+RUN sh /scripts/sccache.sh
+
+ENV CC_aarch64_pc_windows_gnullvm=aarch64-w64-mingw32-clang \
+    CXX_aarch64_pc_windows_gnullvm=aarch64-w64-mingw32-clang++
+
+ENV HOST=aarch64-pc-windows-gnullvm
+
+# We are bootstrapping this target and cannot use previously built artifacts.
+# Without this option Clang is given `"-I/checkout/obj/build/aarch64-pc-windows-gnullvm/ci-llvm/include"`
+# despite no such directory existing:
+# ❯ ls obj/dist-windows-gnullvm/build/aarch64-pc-windows-gnullvm/ -1
+#  llvm
+#  stage2
+ENV NO_DOWNLOAD_CI_LLVM 1
+
+ENV RUST_CONFIGURE_ARGS \
+    --enable-extended \
+    --enable-profiler \
+    --enable-sanitizers \
+    --disable-docs \
+    --set llvm.download-ci-llvm=false \
+    --set rust.llvm-tools=false
+# LLVM cross tools are not installed into expected location so copying fails.
+# Probably will solve itself when building from Windows.
+# --enable-full-tools \
+
+ENV SCRIPT python3 ../x.py dist --host $HOST --target $HOST
diff --git a/src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/install-llvm-mingw.sh b/src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/install-llvm-mingw.sh
new file mode 100755
index 0000000000000..40ad191e4d094
--- /dev/null
+++ b/src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/install-llvm-mingw.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -ex
+
+release_date=20250430
+archive=llvm-mingw-${release_date}-ucrt-ubuntu-22.04-x86_64.tar.xz
+curl -L https://github.com/mstorsjo/llvm-mingw/releases/download/${release_date}/${archive} | \
+tar --extract --xz --strip 1 --directory /usr/local
+
+# https://github.com/mstorsjo/llvm-mingw/issues/493
+ln -s aarch64-w64-windows-gnu.cfg /usr/local/bin/aarch64-pc-windows-gnu.cfg
diff --git a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
index 00552db4b0144..af48e9bcfde9d 100644
--- a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
@@ -114,9 +114,6 @@ ENV TARGETS=$TARGETS,armv7r-none-eabi
 ENV TARGETS=$TARGETS,armv7r-none-eabihf
 ENV TARGETS=$TARGETS,thumbv7neon-unknown-linux-gnueabihf
 ENV TARGETS=$TARGETS,armv7a-none-eabi
-ENV TARGETS=$TARGETS,aarch64-pc-windows-gnullvm
-ENV TARGETS=$TARGETS,i686-pc-windows-gnullvm
-ENV TARGETS=$TARGETS,x86_64-pc-windows-gnullvm
 
 ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft" \
     CFLAGS_arm_unknown_linux_musleabi="-march=armv6 -marm" \
@@ -148,10 +145,7 @@ ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft
     CC_riscv64imac_unknown_none_elf=riscv64-unknown-elf-gcc \
     CFLAGS_riscv64imac_unknown_none_elf=-march=rv64imac -mabi=lp64 \
     CC_riscv64gc_unknown_none_elf=riscv64-unknown-elf-gcc \
-    CFLAGS_riscv64gc_unknown_none_elf=-march=rv64gc -mabi=lp64 \
-    CC_aarch64_pc_windows_gnullvm=aarch64-w64-mingw32-clang \
-    CC_i686_pc_windows_gnullvm=i686-w64-mingw32-clang \
-    CC_x86_64_pc_windows_gnullvm=x86_64-w64-mingw32-clang
+    CFLAGS_riscv64gc_unknown_none_elf=-march=rv64gc -mabi=lp64
 
 ENV RUST_CONFIGURE_ARGS \
       --musl-root-armv5te=/musl-armv5te \
diff --git a/src/ci/docker/host-x86_64/dist-various-1/install-llvm-mingw.sh b/src/ci/docker/host-x86_64/dist-various-1/install-llvm-mingw.sh
deleted file mode 100755
index 95471895fe771..0000000000000
--- a/src/ci/docker/host-x86_64/dist-various-1/install-llvm-mingw.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-release_date=20240404
-archive=llvm-mingw-${release_date}-ucrt-ubuntu-20.04-x86_64.tar.xz
-curl -L https://github.com/mstorsjo/llvm-mingw/releases/download/${release_date}/${archive} | \
-tar --extract --lzma --strip 1 --directory /usr/local
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/Dockerfile
new file mode 100644
index 0000000000000..6902cd2f935b4
--- /dev/null
+++ b/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/Dockerfile
@@ -0,0 +1,49 @@
+FROM ubuntu:22.04
+
+WORKDIR /build
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ca-certificates \
+    cmake \
+    curl \
+    g++ \
+    git \
+    make \
+    ninja-build \
+    python3 \
+    xz-utils
+
+COPY host-x86_64/dist-x86_64-windows-gnullvm/install-llvm-mingw.sh /build
+RUN ./install-llvm-mingw.sh
+
+COPY scripts/sccache.sh /scripts/
+RUN sh /scripts/sccache.sh
+
+ENV CC_i686_pc_windows_gnullvm=i686-w64-mingw32-clang \
+    CC_x86_64_pc_windows_gnullvm=x86_64-w64-mingw32-clang \
+    CXX_x86_64_pc_windows_gnullvm=x86_64-w64-mingw32-clang++
+
+ENV HOST=x86_64-pc-windows-gnullvm
+ENV TARGETS=i686-pc-windows-gnullvm,x86_64-pc-windows-gnullvm
+
+# We are bootstrapping this target and cannot use previously built artifacts.
+# Without this option Clang is given `"-I/checkout/obj/build/aarch64-pc-windows-gnullvm/ci-llvm/include"`
+# despite no such directory existing:
+# ❯ ls obj/dist-windows-gnullvm/build/aarch64-pc-windows-gnullvm/ -1
+#  llvm
+#  stage2
+ENV NO_DOWNLOAD_CI_LLVM 1
+
+ENV RUST_CONFIGURE_ARGS \
+    --enable-extended \
+    --enable-profiler \
+    --enable-sanitizers \
+    --disable-docs \
+    --set llvm.download-ci-llvm=false \
+    --set rust.llvm-tools=false
+# LLVM cross tools are not installed into expected location so copying fails.
+# Probably will solve itself when building from Windows.
+# --enable-full-tools \
+
+ENV SCRIPT python3 ../x.py dist --host $HOST --target $TARGETS
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/install-llvm-mingw.sh b/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/install-llvm-mingw.sh
new file mode 100755
index 0000000000000..ca6c4d7023656
--- /dev/null
+++ b/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/install-llvm-mingw.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -ex
+
+release_date=20250528
+archive=llvm-mingw-${release_date}-ucrt-ubuntu-22.04-x86_64.tar.xz
+curl -L https://github.com/mstorsjo/llvm-mingw/releases/download/${release_date}/${archive} | \
+tar --extract --xz --strip 1 --directory /usr/local
+
+# https://github.com/mstorsjo/llvm-mingw/issues/493
+for arch in i686 x86_64; do
+    ln -s $arch-w64-windows-gnu.cfg /usr/local/bin/$arch-pc-windows-gnu.cfg
+done
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 43c77d1ddf7f5..9e89d86e1982b 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -237,6 +237,12 @@ auto:
   - name: dist-s390x-linux
     <<: *job-linux-4c
 
+  - name: dist-aarch64-windows-gnullvm
+    <<: *job-linux-4c
+
+  - name: dist-x86_64-windows-gnullvm
+    <<: *job-linux-4c
+
   - name: dist-various-1
     <<: *job-linux-4c