diff --git a/.gitmodules b/.gitmodules
index 859b0bff9503e3be1ac3da5b79bd8ae941c7a033..f82e90105fad47f75e3135b5ab41125679fbbf61 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,11 +2,11 @@
 	path = libs/devlib
 	url = https://github.com/derkling/devlib.git
 	branch = devlib-next
-[submodule "trappy-next"]
+[submodule "trappy-lisa"]
 	path = libs/trappy
-	url = https://github.com/derkling/trappy.git
-	branch = trappy-next
-[submodule "bart-next"]
+	url = https://github.com/ARM-software/trappy.git
+	branch = lisa
+[submodule "bart-lisa"]
 	path = libs/bart
-	url = https://github.com/derkling/bart.git
-	branch = bart-next
+	url = https://github.com/ARM-software/bart.git
+	branch = lisa