diff --git a/.gitmodules b/.gitmodules
index c263bdf934..20028c8155 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -48,11 +48,11 @@
 	branch = master
 [submodule "platforms/nuttx/NuttX/nuttx"]
 	path = platforms/nuttx/NuttX/nuttx
-	url = https://github.com/PX4-NuttX/nuttx.git
+	url = https://github.com/PX4/NuttX.git
 	branch = px4_firmware_nuttx-7.22+
 [submodule "platforms/nuttx/NuttX/apps"]
 	path = platforms/nuttx/NuttX/apps
-	url = https://github.com/PX4-NuttX/apps.git
+	url = https://github.com/PX4/NuttX-apps.git
 	branch = px4_firmware_nuttx-7.22+
 [submodule "cmake/configs/uavcan_board_ident"]
 	path = cmake/configs/uavcan_board_ident