diff --git a/.gitmodules b/.gitmodules
index 859b0bff9503e3be1ac3da5b79bd8ae941c7a033..dade2277b43e34d0938d0fdf992784984ae7d778 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,10 @@
-[submodule "devlib-next"]
+[submodule "libs/devlib"]
 	path = libs/devlib
 	url = https://github.com/derkling/devlib.git
 	branch = devlib-next
-[submodule "trappy-next"]
+[submodule "libs/trappy"]
 	path = libs/trappy
-	url = https://github.com/derkling/trappy.git
-	branch = trappy-next
-[submodule "bart-next"]
+	url = https://github.com/ARM-Software/trappt.git
+[submodule "libs/bart"]
 	path = libs/bart
-	url = https://github.com/derkling/bart.git
-	branch = bart-next
+	url = https://github.com/ARM-Software/bart.git
diff --git a/init_env b/init_env
index 81c0a118da0a17fbbe55a49b718879e0817f1d89..c267cdbe5e907f55421e59c825c436aa7ab67620 100644
--- a/init_env
+++ b/init_env
@@ -6,23 +6,18 @@ export PYTHONPATH=''
 export PYTHONPATH=`pwd`/libs/utils:$PYTHONPATH
 export PYTHONPATH=`pwd`/libs/wlgen:$PYTHONPATH
 
-if [ "x$DEVMODE" == "x1" ]; then
+if [[ "x$DEVMODE" == "x1" ]]; then
 	export PYTHONPATH=`pwd`/libs/devlib:$PYTHONPATH
 	export PYTHONPATH=`pwd`/libs/trappy:$PYTHONPATH
 	export PYTHONPATH=`pwd`/libs/bart:$PYTHONPATH
 
 	echo
-	echo 'Developer mode ENABLED, using libraries provided by submodules'
-	echo 'PYTHONPATH: '
-	echo $PYTHONPATH
+	echo 'Developer mode ENABLED, using libraries provided by:'
+	echo "  ${PYTHONPATH//:/\\n  }"
 	echo
 
-	if [ ! -f libs/devlib/README.rst ]; then
-		echo 'Initializing submodules...'
-		git submodule init
-	fi
-	echo 'Update submodules if required'
-	git submodule update
+	echo 'Checking for sumbmodules updates required...'
+	git submodule update --init
 	echo 'DONE'
 fi
 
diff --git a/libs/bart b/libs/bart
index b7fe442093cd3ea4c2148f1e56c9b0b793238654..290caafb3675103f8ee91b71245a7aba0f2b0c2c 160000
--- a/libs/bart
+++ b/libs/bart
@@ -1 +1 @@
-Subproject commit b7fe442093cd3ea4c2148f1e56c9b0b793238654
+Subproject commit 290caafb3675103f8ee91b71245a7aba0f2b0c2c
diff --git a/libs/trappy b/libs/trappy
index 9a6ecdad176389e2c66b5cac2e72cf6049f2254f..26cf414f6b6c5eca30ef12822bc03e06cb1adc34 160000
--- a/libs/trappy
+++ b/libs/trappy
@@ -1 +1 @@
-Subproject commit 9a6ecdad176389e2c66b5cac2e72cf6049f2254f
+Subproject commit 26cf414f6b6c5eca30ef12822bc03e06cb1adc34