diff --git a/Makefile b/Makefile
index 97bf5cb..06b1396 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,8 @@ rocq/config/coq_config.ml: rocq
 	        -libdir "$$EPATH/_build/install/default/lib/coq" \
 	        -bytecode-compiler yes \
 		-native-compiler no \
-	&& cp theories/dune.disabled theories/dune \
-	&& cp user-contrib/Ltac2/dune.disabled user-contrib/Ltac2/dune
+	&& cp theories/Corelib/dune.disabled theories/Corelib/dune \
+	&& cp theories/Ltac2/dune.disabled theories/Ltac2/dune
 
 # We set windows parameters a bit better, note the need to use forward
 # slashed (cygpath -m) due to escaping :( , a conversion to `-w` is
@@ -24,12 +24,12 @@ rocq/config/coq_config.ml: rocq
 .PHONY: winconfig
 winconfig:
 	EPATH=$(shell cygpath -am .) \
-	&& cd vendor/coq \
+	&& cd rocq \
 	&& ./configure -no-ask -prefix "$$EPATH\\_build\\install\\default\\" \
 	        -libdir "$$EPATH\\_build\\install\\default\\lib\\coq\\" \
 		-native-compiler no \
-	&& cp theories/dune.disabled theories/dune \
-	&& cp user-contrib/Ltac2/dune.disabled user-contrib/Ltac2/dune
+	&& cp theories/Corelib/dune.disabled theories/Corelib/dune \
+	&& cp theories/Ltac2/dune.disabled theories/Ltac2/dune
 
 .PHONY: clean
 clean:
@@ -50,3 +50,17 @@ launch: build
 opam-deps:
 	opam install ./rocq/rocq-runtime.opam -y --deps-only --with-test
 	opam install ./coq-lsp/coq-lsp.opam -y --deps-only --with-test
+
+# Initialise submodules
+.PHONY: submodules-init
+submodules-init:
+	git submodule update --init
+
+# Update submodules from upstream
+.PHONY: submodules-update
+submodules-update:
+	(cd rocq                 && git checkout master     && git pull origin master)
+	(cd stdlib               && git checkout master     && git pull origin master)
+	(cd coq-lsp              && git checkout main       && git pull origin main)
+	(cd coq-waterproof       && git checkout coq-master && git pull origin coq-master)
+	(cd waterproof-exercises && git checkout main       && git pull origin main)
diff --git a/coq-lsp b/coq-lsp
index 0e9aab0..8812ff6 160000
--- a/coq-lsp
+++ b/coq-lsp
@@ -1 +1 @@
-Subproject commit 0e9aab06e416ff99d0844fabce35901ca87ebbf2
+Subproject commit 8812ff6b00d5738517c5e40af94e0ad4988176ef
diff --git a/coq-waterproof b/coq-waterproof
index 506f499..dd712eb 160000
--- a/coq-waterproof
+++ b/coq-waterproof
@@ -1 +1 @@
-Subproject commit 506f49982b07e86aee777f7facbdee9847016566
+Subproject commit dd712eb0b7f5c205870dbd156736a684d40eeb9a
diff --git a/rocq b/rocq
index 47080cb..be26673 160000
--- a/rocq
+++ b/rocq
@@ -1 +1 @@
-Subproject commit 47080cb2952dddc1076adc285aa03c1f006ef672
+Subproject commit be266736842a4ee7ef860bb7d7dc24769596a635
diff --git a/stdlib b/stdlib
index 6d68905..71a6beb 160000
--- a/stdlib
+++ b/stdlib
@@ -1 +1 @@
-Subproject commit 6d68905019712f1a7ead215c02bdd01c41d9f088
+Subproject commit 71a6beb0b14452fe8042d1c010b56be4b66403c0