diff --git a/.gitmodules b/.gitmodules
index b3d1bfc0bf..a53aa38a76 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,13 +6,11 @@
 	url = https://github.com/WebAssembly/wasm-c-api
 [submodule "WASI"]
 	path = crates/wasi-common/WASI
-	url = https://github.com/alexcrichton/WASI
-	branch = abis
+	url = https://github.com/WebAssembly/WASI
 [submodule "crates/wasi-nn/spec"]
 	path = crates/wasi-nn/spec
 	url = https://github.com/alexcrichton/wasi-nn
 	branch = witx-next
 [submodule "crates/wasi-crypto/spec"]
 	path = crates/wasi-crypto/spec
-	url = https://github.com/alexcrichton/wasi-crypto.git
-	branch = witx-next
+	url = https://github.com/WebAssembly/wasi-crypto.git
diff --git a/crates/wasi-common/WASI b/crates/wasi-common/WASI
index 449b38179e..ef8c1a53fe 160000
--- a/crates/wasi-common/WASI
+++ b/crates/wasi-common/WASI
@@ -1 +1 @@
-Subproject commit 449b38179e39d6cf1e575967527315f87aa677d4
+Subproject commit ef8c1a53feb2dfb763d4ea5c7d9e0a0126b45579
diff --git a/crates/wasi-crypto/spec b/crates/wasi-crypto/spec
index 3ed3f0796d..1f3078088b 160000
--- a/crates/wasi-crypto/spec
+++ b/crates/wasi-crypto/spec
@@ -1 +1 @@
-Subproject commit 3ed3f0796db3c24e170cb86fe70d86a9e1c5d683
+Subproject commit 1f3078088bd0de36a0bc96859a1724e7d338a832