diff --git a/.gitmodules b/.gitmodules
index 303acdd8cb..fa1ddcbee2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,16 +4,16 @@
 	branch = master
 [submodule "src/drivers/uavcan/libuavcan"]
 	path = src/drivers/uavcan/libuavcan
-	url = https://github.com/UAVCAN/libuavcan.git
-	branch = master
+	url = https://github.com/PX4/uavcan.git
+	branch = px4
 [submodule "msg/tools/genmsg"]
 	path = msg/tools/genmsg
-	url = https://github.com/ros/genmsg.git
-	branch = indigo-devel
+	url = https://github.com/PX4/genmsg.git
+	branch = px4
 [submodule "msg/tools/gencpp"]
 	path = msg/tools/gencpp
-	url = https://github.com/ros/gencpp.git
-	branch = indigo-devel
+	url = https://github.com/PX4/gencpp.git
+	branch = px4
 [submodule "Tools/jMAVSim"]
 	path = Tools/jMAVSim
 	url = https://github.com/PX4/jMAVSim.git
@@ -36,16 +36,16 @@
 	branch = master
 [submodule "boards/atlflight/cmake_hexagon"]
 	path = boards/atlflight/cmake_hexagon
-	url = https://github.com/ATLFlight/cmake_hexagon.git
-	branch = master
+	url = https://github.com/PX4/cmake_hexagon.git
+	branch = px4
 [submodule "src/drivers/gps/devices"]
 	path = src/drivers/gps/devices
 	url = https://github.com/PX4/GpsDrivers.git
 	branch = master
 [submodule "src/modules/micrortps_bridge/micro-CDR"]
 	path = src/modules/micrortps_bridge/micro-CDR
-	url = https://github.com/eProsima/micro-CDR.git
-	branch = master
+	url = https://github.com/PX4/micro-CDR.git
+	branch = px4
 [submodule "platforms/nuttx/NuttX/nuttx"]
 	path = platforms/nuttx/NuttX/nuttx
 	url = https://github.com/PX4/NuttX.git