diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 65b848f..fba2344 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -12,8 +12,8 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  WASI_SDK_VERSION: 20.46gf3a1f8991535
-  WASI_SDK_RELEASE: wasi-sockets-alpha-5
+  WASI_SDK_VERSION: 25.0
+  WASI_SDK_RELEASE: wasi-sdk-25
 
 permissions:
   contents: write
@@ -36,12 +36,12 @@ jobs:
       - name: Install latest Rust nightly toolchain
         uses: dtolnay/rust-toolchain@nightly
         with:
-          targets: wasm32-wasip1 wasm32-unknown-unknown
+          targets: wasm32-wasip2 wasm32-unknown-unknown
 
       - name: Install latest Rust stable toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: wasm32-wasip1 wasm32-unknown-unknown
+          targets: wasm32-wasip2 wasm32-unknown-unknown
           components: clippy, rustfmt
 
       - name: Install Rust std source
@@ -57,7 +57,7 @@ jobs:
         shell: bash
         run: |
           cd /tmp
-          curl -LO https://github.com/dicej/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
+          curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
           tar xf wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
           mv wasi-sdk-${WASI_SDK_VERSION} /opt/wasi-sdk
 
@@ -182,7 +182,7 @@ jobs:
         shell: bash
         run: |
           cd /tmp
-          curl -LO https://github.com/dicej/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz
+          curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz
           tar xf wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz
 
       - name: Install WASI-SDK
@@ -213,7 +213,7 @@ jobs:
           before-script-linux: |
             rustup install nightly
             rustup component add rust-src --toolchain nightly
-            rustup target add wasm32-wasip1 wasm32-unknown-unknown
+            rustup target add wasm32-wasip2 wasm32-unknown-unknown
 
       - name: Set up cross-compiled linux aarch64 build
         if: matrix.config.target == 'aarch64-unknown-linux-gnu'
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 2c9767d..b2c82e6 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -10,8 +10,8 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  WASI_SDK_VERSION: 20.46gf3a1f8991535
-  WASI_SDK_RELEASE: wasi-sockets-alpha-5
+  WASI_SDK_VERSION: 25.0
+  WASI_SDK_RELEASE: wasi-sdk-25
 
 jobs:
   linux:
@@ -30,12 +30,12 @@ jobs:
       - name: Install latest Rust nightly toolchain
         uses: dtolnay/rust-toolchain@nightly
         with:
-          targets: wasm32-wasip1 wasm32-unknown-unknown
+          targets: wasm32-wasip2 wasm32-unknown-unknown
 
       - name: Install latest Rust stable toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: wasm32-wasip1 wasm32-unknown-unknown
+          targets: wasm32-wasip2 wasm32-unknown-unknown
           components: clippy, rustfmt
 
       - name: Install Rust std source
@@ -51,7 +51,7 @@ jobs:
         shell: bash
         run: |
           cd /tmp
-          curl -LO https://github.com/dicej/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
+          curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
           tar xf wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
           mv wasi-sdk-${WASI_SDK_VERSION} /opt/wasi-sdk
 
@@ -86,12 +86,12 @@ jobs:
       - name: Install latest Rust nightly toolchain
         uses: dtolnay/rust-toolchain@nightly
         with:
-          targets: wasm32-wasip1 wasm32-unknown-unknown
+          targets: wasm32-wasip2 wasm32-unknown-unknown
 
       - name: Install latest Rust stable toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: wasm32-wasip1 wasm32-unknown-unknown
+          targets: wasm32-wasip2 wasm32-unknown-unknown
           components: clippy, rustfmt
 
       - name: Install Rust std source
@@ -107,7 +107,7 @@ jobs:
         shell: bash
         run: |
           cd /tmp
-          curl -LO https://github.com/dicej/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz
+          curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz
           tar xf wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz
 
       - name: Install WASI-SDK
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d84b9ef..b19b913 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,8 +30,8 @@ For Rust, something like this should work once you have `rustup`:
 rustup update
 rustup install nightly
 rustup component add rust-src --toolchain nightly
-rustup target add wasm32-wasip1 wasm32-unknown-unknown
-rustup target add --toolchain nightly wasm32-wasip1 wasm32-unknown-unknown
+rustup target add wasm32-wasip2 wasm32-unknown-unknown
+rustup target add --toolchain nightly wasm32-wasip2 wasm32-unknown-unknown
 ```
 
 ### Building and Running
@@ -48,9 +48,9 @@ variable).  Replace `linux` with `macos` or `mingw` (Windows) below depending on
 your OS.
 
 ```shell
-curl -LO https://github.com/dicej/wasi-sdk/releases/download/wasi-sockets-alpha-5/wasi-sdk-20.46gf3a1f8991535-linux.tar.gz
-tar xf wasi-sdk-20.46gf3a1f8991535-linux.tar.gz
-sudo mv wasi-sdk-20.46gf3a1f8991535 /opt/wasi-sdk
+curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-linux.tar.gz
+tar xf wasi-sdk-25.0-x86_64-linux.tar.gz
+sudo mv wasi-sdk-25.0-x86_64-linux /opt/wasi-sdk
 export WASI_SDK_PATH=/opt/wasi-sdk
 ```
 
diff --git a/build.rs b/build.rs
index e7148cb..8a4c62b 100644
--- a/build.rs
+++ b/build.rs
@@ -112,7 +112,7 @@ fn package_all_the_things(out_dir: &Path) -> Result<()> {
         .arg("-Z")
         .arg("build-std=panic_abort,std")
         .arg("--release")
-        .arg("--target=wasm32-wasip1");
+        .arg("--target=wasm32-wasip2");
 
     for (key, _) in env::vars_os() {
         if key
@@ -132,7 +132,7 @@ fn package_all_the_things(out_dir: &Path) -> Result<()> {
     assert!(status.success());
     println!("cargo:rerun-if-changed=runtime");
 
-    let path = out_dir.join("wasm32-wasip1/release/libcomponentize_py_runtime.a");
+    let path = out_dir.join("wasm32-wasip2/release/libcomponentize_py_runtime.a");
 
     if path.exists() {
         let clang = wasi_sdk.join(format!("bin/{CLANG_EXECUTABLE}"));