diff --git a/.github/workflows/build-gems.yml b/.github/workflows/build-gems.yml
index e743e2c7a..7556cced2 100644
--- a/.github/workflows/build-gems.yml
+++ b/.github/workflows/build-gems.yml
@@ -18,7 +18,7 @@ jobs:
         id: fetch
         with:
           supported-ruby-platforms: |
-            exclude: [arm-linux, x64-mingw32]
+            exclude: [arm-linux, x64-mingw32, aarch64-mingw-ucrt]
           stable-ruby-versions: |
             exclude: [head]
 
diff --git a/lib/ruby_wasm/build/toolchain.rb b/lib/ruby_wasm/build/toolchain.rb
index 83b2a6459..8b0a27b40 100644
--- a/lib/ruby_wasm/build/toolchain.rb
+++ b/lib/ruby_wasm/build/toolchain.rb
@@ -56,7 +56,7 @@ class WASISDK < Toolchain
     def initialize(
       wasi_sdk_path = ENV["WASI_SDK_PATH"],
       build_dir: nil,
-      version_major: 21,
+      version_major: 25,
       version_minor: 0,
       binaryen_version: 108
     )
@@ -111,8 +111,9 @@ def wasi_sdk_path
     def download_url(version_major, version_minor)
       version = "#{version_major}.#{version_minor}"
       assets = [
-        [/x86_64-linux/, "wasi-sdk-#{version}-linux.tar.gz"],
-        [/(arm64e?|x86_64)-darwin/, "wasi-sdk-#{version}-macos.tar.gz"]
+        [/x86_64-linux/, "wasi-sdk-#{version}-x86_64-linux.tar.gz"],
+        [/arm64e?-darwin/, "wasi-sdk-#{version}-arm64-macos.tar.gz"],
+        [/x86_64-darwin/, "wasi-sdk-#{version}-x86_64-macos.tar.gz"]
       ]
       asset = assets.find { |os, _| os =~ RUBY_PLATFORM }&.at(1)
       if asset.nil?