diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e1c765e995..0405956c08 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -81,7 +81,7 @@ jobs:
         #- mips64el-unknown-linux-gnuabi64
         #- mipsel-unknown-linux-musl
         - s390x-unknown-linux-gnu
-        - wasm32-wasi
+        - wasm32-wasip1
         - i586-unknown-linux-gnu
         - nvptx64-nvidia-cuda
         - thumbv6m-none-eabi
@@ -135,7 +135,7 @@ jobs:
           disable_assert_instr: true
         - target: s390x-unknown-linux-gnu
           os: ubuntu-latest
-        - target: wasm32-wasi
+        - target: wasm32-wasip1
           os: ubuntu-latest
         - target: aarch64-apple-darwin
           os: macos-latest
diff --git a/ci/docker/wasm32-wasi/Dockerfile b/ci/docker/wasm32-wasi/Dockerfile
deleted file mode 100644
index 5be645507f..0000000000
--- a/ci/docker/wasm32-wasi/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM ubuntu:20.04
-
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update -y && apt-get install -y --no-install-recommends \
-  ca-certificates \
-  curl \
-  xz-utils \
-  clang
-
-RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v8.0.0/wasmtime-v8.0.0-x86_64-linux.tar.xz | tar xJf -
-ENV PATH=$PATH:/wasmtime-v8.0.0-x86_64-linux
-
-ENV CARGO_TARGET_WASM32_WASI_RUNNER="wasmtime \
-  --wasm-features=threads,relaxed-simd \
-  --mapdir .::/checkout/target/wasm32-wasi/release/deps \
-  --"
diff --git a/ci/docker/wasm32-wasip1/Dockerfile b/ci/docker/wasm32-wasip1/Dockerfile
new file mode 100644
index 0000000000..f92539b302
--- /dev/null
+++ b/ci/docker/wasm32-wasip1/Dockerfile
@@ -0,0 +1,13 @@
+FROM ubuntu:20.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update -y && apt-get install -y --no-install-recommends \
+  ca-certificates \
+  curl \
+  xz-utils \
+  clang
+
+RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v18.0.2/wasmtime-v18.0.2-x86_64-linux.tar.xz | tar xJf -
+ENV PATH=$PATH:/wasmtime-v18.0.2-x86_64-linux
+
+ENV CARGO_TARGET_WASM32_WASIP1_RUNNER="wasmtime --dir /checkout/target/wasm32-wasip1/release/deps::."