diff --git a/.gitmodules b/.gitmodules
index 8b18c71..ee25889 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -265,30 +265,27 @@
 [submodule "runes"]
 	path = runes
 	url = https://sys4.fr/gitea/nalc/runes.git
+[submodule "serverguide"]
+	path = serverguide
+	url = https://sys4.fr/gitea/nalc/serverguide.git
 [submodule "shutdown"]
 	path = shutdown
 	url = https://sys4.fr/gitea/nalc/shutdown.git
-	branch = nalc
 [submodule "signs_lib"]
 	path = signs_lib
-	url = https://sys4.fr/gitea/nalc/signs_lib.git
-	branch = nalc
+	url = https://sys4.fr/gitea/mtcontrib/signs_lib.git
 [submodule "snow"]
 	path = snow
 	url = https://sys4.fr/gitea/nalc/minetest-mod-snow.git
-	branch = nalc-1.1
 [submodule "spears"]
 	path = spears
 	url = https://sys4.fr/gitea/nalc/spears.git
-	branch = nalc
 [submodule "sponge"]
 	path = sponge
 	url = https://sys4.fr/gitea/nalc/sponge.git
-	branch = nalc
 [submodule "stained_glass"]
 	path = stained_glass
-	url = https://sys4.fr/gitea/nalc/stained_glass.git
-	branch = nalc
+	url = https://sys4.fr/gitea/minetest-mods/stained_glass.git
 [submodule "technic"]
 	path = technic
 	url = https://sys4.fr/gitea/nalc/technic.git
@@ -445,10 +442,6 @@
 	path = unified_inventory
 	url = https://sys4.fr/gitea/nalc/unified_inventory.git
 	branch = nalc-1.1
-[submodule "serverguide"]
-	path = serverguide
-	url = https://sys4.fr/gitea/nalc/serverguide.git
-	branch = nalc-1.1
 [submodule "irc"]
 	path = irc
 	url = https://sys4.fr/gitea/nalc/irc.git