diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh
index a53b45cafa287..2349a4f698d50 100755
--- a/tools/ci/cibuild.sh
+++ b/tools/ci/cibuild.sh
@@ -555,7 +555,7 @@ function setup_repos {
   if [ -d "${nuttx}" ]; then
     cd "${nuttx}"; git pull
   else
-    git clone https://github.com/apache/nuttx.git "${nuttx}"
+    git clone https://github.com/tiiuae/nuttx.git "${nuttx}"
     cd "${nuttx}"
   fi
   git log -1
@@ -563,7 +563,7 @@ function setup_repos {
   if [ -d "${apps}" ]; then
     cd "${apps}"; git pull
   else
-    git clone https://github.com/apache/nuttx-apps.git "${apps}"
+    git clone https://github.com/tiiuae/nuttx-apps.git "${apps}"
     cd "${apps}"
   fi
   git log -1