diff --git a/.gitmodules b/.gitmodules
index 2fb1c5c3..a16fd115 100755
--- a/.gitmodules
+++ b/.gitmodules
@@ -224,9 +224,6 @@
 [submodule "mods/rhotator"]
 	path = mods/rhotator
 	url = ../../Illuna-Minetest/rhotator
-[submodule "mods/pipeworks"]
-	path = mods/pipeworks
-	url = https://gitlab.com/VanessaE/pipeworks
 [submodule "mods/sea"]
 	path = mods/sea
 	url = ../../Illuna-Minetest/minetest-mod-sea
@@ -251,27 +248,12 @@
 [submodule "mods/cloaking"]
 	path = mods/cloaking
 	url = https://github.com/luk3yx/minetest-cloaking
-[submodule "mods/signs_lib"]
-	path = mods/signs_lib
-	url = https://gitlab.com/VanessaE/signs_lib
-[submodule "mods/basic_signs"]
-	path = mods/basic_signs
-	url = https://gitlab.com/VanessaE/basic_signs
 [submodule "mods/moreblocks"]
 	path = mods/moreblocks
 	url = https://github.com/minetest-mods/moreblocks
-[submodule "mods/basic_materials"]
-	path = mods/basic_materials
-	url = https://gitlab.com/VanessaE/basic_materials
-[submodule "mods/unifieddyes"]
-	path = mods/unifieddyes
-	url = https://gitlab.com/VanessaE/unifieddyes
 [submodule "mods/arrow_signs"]
 	path = mods/arrow_signs
 	url = https://bitbucket.org/adrido/arrow_signs/
-[submodule "mods/biome_lib"]
-	path = mods/biome_lib
-	url = https://gitlab.com/VanessaE/biome_lib
 [submodule "mods/bitchange"]
 	path = mods/bitchange
 	url = ../../Illuna-Minetest/bitchange
@@ -320,3 +302,21 @@
 [submodule "mods/we_undo"]
 	path = mods/we_undo
 	url = https://github.com/HybridDog/we_undo
+[submodule "mods/basic_materials"]
+	path = mods/basic_materials
+	url = https://github.com/mt-mods/basic_materials
+[submodule "mods/basic_signs"]
+	path = mods/basic_signs
+	url = https://github.com/mt-mods/basic_signs
+[submodule "mods/biome_lib"]
+	path = mods/biome_lib
+	url = https://github.com/mt-mods/biome_lib
+[submodule "mods/pipeworks"]
+	path = mods/pipeworks
+	url = https://github.com/mt-mods/pipeworks
+[submodule "mods/signs_lib"]
+	path = mods/signs_lib
+	url = https://github.com/mt-mods/signs_lib
+[submodule "mods/unifieddyes"]
+	path = mods/unifieddyes
+	url = https://github.com/mt-mods/unifieddyes
diff --git a/mods/basic_materials b/mods/basic_materials
index cb713668..0893974b 160000
--- a/mods/basic_materials
+++ b/mods/basic_materials
@@ -1 +1 @@
-Subproject commit cb713668d26843ddd241272e6169aebbffe95833
+Subproject commit 0893974b054a2191b5e2d5447ee4fc73f9c35f6a
diff --git a/mods/pipeworks b/mods/pipeworks
index cec6049d..8f067db7 160000
--- a/mods/pipeworks
+++ b/mods/pipeworks
@@ -1 +1 @@
-Subproject commit cec6049dd114230468a7e484702240ce8d1c496c
+Subproject commit 8f067db7cd69fc05cc6e72fdd53b82de98f169ed