diff --git a/.github/workflows/repro.sh b/.github/workflows/repro.sh
index ad160eb..443e700 100755
--- a/.github/workflows/repro.sh
+++ b/.github/workflows/repro.sh
@@ -2,22 +2,25 @@
 set -euo pipefail
 
 if [[ "$OSTYPE" == "linux"* ]]; then
-  WASI_SDK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-23/wasi-sdk-23.0-linux.tar.gz"
+  WASI_SDK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-23/wasi-sdk-23.0-x86_64-linux.tar.gz"
   BINARYEN="https://github.com/WebAssembly/binaryen/releases/download/version_118/binaryen-version_118-x86_64-linux.tar.gz"
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-  WASI_SDK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-23/wasi-sdk-23.0-macos.tar.gz"
+  WASI_SDK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-23/wasi-sdk-23.0-x86_64-macos.tar.gz"
   BINARYEN="https://github.com/WebAssembly/binaryen/releases/download/version_118/binaryen-version_118-x86_64-macos.tar.gz"
 elif [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
-  WASI_SDK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-23/wasi-sdk-23.0.m-mingw.tar.gz"
+  WASI_SDK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-23/wasi-sdk-23.0-x86_64-windows.tar.gz"
   BINARYEN="https://github.com/WebAssembly/binaryen/releases/download/version_118/binaryen-version_118-x86_64-windows.tar.gz"
 fi
 
 # Download tools
 mkdir -p tools/
-[ -d "tools/wasi-sdk"* ]         || curl -#L "$WASI_SDK" | tar xzC tools &
-[ -d "tools/binaryen-version"* ] || curl -#L "$BINARYEN" | tar xzC tools &
+[ -d "tools/wasi-sdk" ] || curl -#L "$WASI_SDK" | tar xzC tools &
+[ -d "tools/binaryen" ] || curl -#L "$BINARYEN" | tar xzC tools &
 wait
 
+mv "tools/wasi-sdk"* "tools/wasi-sdk"
+mv "tools/binaryen"* "tools/binaryen"
+
 # Download and build SQLite
 sqlite3/download.sh
 embed/build.sh
diff --git a/embed/build.sh b/embed/build.sh
index 014bd22..3422059 100755
--- a/embed/build.sh
+++ b/embed/build.sh
@@ -4,8 +4,8 @@ set -euo pipefail
 cd -P -- "$(dirname -- "$0")"
 
 ROOT=../
-BINARYEN="$ROOT/tools/binaryen-version_118/bin"
-WASI_SDK="$ROOT/tools/wasi-sdk-23.0/bin"
+BINARYEN="$ROOT/tools/binaryen/bin"
+WASI_SDK="$ROOT/tools/wasi-sdk/bin"
 
 "$WASI_SDK/clang" --target=wasm32-wasi -std=c23 -flto -g0 -O2 \
 	-Wall -Wextra -Wno-unused-parameter -Wno-unused-function \
diff --git a/util/vtabutil/parse/build.sh b/util/vtabutil/parse/build.sh
index 8d33228..4e3f563 100755
--- a/util/vtabutil/parse/build.sh
+++ b/util/vtabutil/parse/build.sh
@@ -4,8 +4,8 @@ set -euo pipefail
 cd -P -- "$(dirname -- "$0")"
 
 ROOT=../../../
-BINARYEN="$ROOT/tools/binaryen-version_118/bin"
-WASI_SDK="$ROOT/tools/wasi-sdk-23.0/bin"
+BINARYEN="$ROOT/tools/binaryen/bin"
+WASI_SDK="$ROOT/tools/wasi-sdk/bin"
 
 "$WASI_SDK/clang" --target=wasm32-wasi -std=c23 -flto -g0 -Oz \
 	-Wall -Wextra -o sql3parse_table.wasm main.c \
diff --git a/vfs/tests/mptest/testdata/build.sh b/vfs/tests/mptest/testdata/build.sh
index eeaf4d7..53d3bf4 100755
--- a/vfs/tests/mptest/testdata/build.sh
+++ b/vfs/tests/mptest/testdata/build.sh
@@ -4,8 +4,8 @@ set -euo pipefail
 cd -P -- "$(dirname -- "$0")"
 
 ROOT=../../../../
-BINARYEN="$ROOT/tools/binaryen-version_118/bin"
-WASI_SDK="$ROOT/tools/wasi-sdk-23.0/bin"
+BINARYEN="$ROOT/tools/binaryen/bin"
+WASI_SDK="$ROOT/tools/wasi-sdk/bin"
 
 "$WASI_SDK/clang" --target=wasm32-wasi -std=c23 -flto -g0 -O2 \
 	-o mptest.wasm main.c \
diff --git a/vfs/tests/speedtest1/testdata/build.sh b/vfs/tests/speedtest1/testdata/build.sh
index 84bae28..396c676 100755
--- a/vfs/tests/speedtest1/testdata/build.sh
+++ b/vfs/tests/speedtest1/testdata/build.sh
@@ -4,8 +4,8 @@ set -euo pipefail
 cd -P -- "$(dirname -- "$0")"
 
 ROOT=../../../../
-BINARYEN="$ROOT/tools/binaryen-version_118/bin"
-WASI_SDK="$ROOT/tools/wasi-sdk-23.0/bin"
+BINARYEN="$ROOT/tools/binaryen/bin"
+WASI_SDK="$ROOT/tools/wasi-sdk/bin"
 
 "$WASI_SDK/clang" --target=wasm32-wasi -std=c23 -flto -g0 -O2 \
 	-o speedtest1.wasm main.c \