diff --git a/.gitmodules b/.gitmodules
index 80d7961bfecb..2f6c628a2f24 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,10 +1,10 @@
-[submodule "spec_testsuite"]
+[submodule "tests/spec_testsuite"]
 	path = tests/spec_testsuite
 	url = https://github.com/WebAssembly/testsuite
-[submodule "crates/c-api/examples/wasm-c-api"]
+[submodule "crates/c-api/wasm-c-api"]
 	path = crates/c-api/wasm-c-api
 	url = https://github.com/WebAssembly/wasm-c-api
-[submodule "WASI"]
+[submodule "crates/wasi-common/WASI"]
 	path = crates/wasi-common/WASI
 	url = https://github.com/WebAssembly/WASI
 [submodule "crates/wasi-nn/spec"]
@@ -13,10 +13,7 @@
 [submodule "tests/wasi_testsuite/wasi-threads"]
 	path = tests/wasi_testsuite/wasi-threads
 	url = https://github.com/WebAssembly/wasi-threads
-[submodule "crates/wasi-http/wasi-http"]
-	path = crates/wasi-http/wasi-http
-	url = https://github.com/WebAssembly/wasi-http
-[submodule "tests/wasi_testsuite/wasi"]
+[submodule "tests/wasi_testsuite/wasi-common"]
 	path = tests/wasi_testsuite/wasi-common
 	url = https://github.com/WebAssembly/wasi-testsuite.git
 	branch = prod/testsuite-base
diff --git a/crates/wasi-http/wasi-http b/crates/wasi-http/wasi-http
deleted file mode 160000
index 1c95bc21dbd1..000000000000
--- a/crates/wasi-http/wasi-http
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1c95bc21dbd193b046e4232d063a82c8b5ba7994