diff --git a/.travis.yml b/.travis.yml
index c7ae3d4038..8b70f2d8ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,10 +68,10 @@ matrix:
     - compiler: "gcc Native"
       env: CI_BUILD_TARGET="sitl linux minlure"
     - compiler: "gcc Linux"
-      env: CI_BUILD_TARGET="navio raspilot bebop"
+      env: CI_BUILD_TARGET="navio2 raspilot bebop"
     - compiler: "gcc SITL Test"
       env: CI_BUILD_TARGET="sitltest"
     - compiler: "clang Native"
       env: CI_BUILD_TARGET="sitl linux minlure"
     - compiler: "clang Linux"
-      env: CI_BUILD_TARGET="navio raspilot bebop"
+      env: CI_BUILD_TARGET="navio2 raspilot bebop"
diff --git a/Tools/scripts/build_ci.sh b/Tools/scripts/build_ci.sh
index 543a3123c3..cc4583de14 100755
--- a/Tools/scripts/build_ci.sh
+++ b/Tools/scripts/build_ci.sh
@@ -25,7 +25,7 @@ fi
 
 # If CI_BUILD_TARGET is not set, default to all of them
 if [ -z "$CI_BUILD_TARGET" ]; then
-    CI_BUILD_TARGET="sitl linux navio raspilot minlure bebop px4-v2 px4-v4"
+    CI_BUILD_TARGET="sitl linux navio2 raspilot minlure bebop px4-v2 px4-v4"
 fi
 
 declare -A build_platforms
@@ -33,13 +33,13 @@ declare -A build_concurrency
 declare -A build_extra_clean
 declare -A waf_supported_boards
 
-build_platforms=(  ["ArduPlane"]="navio raspilot minlure bebop sitl linux px4-v2"
-                   ["ArduCopter"]="navio raspilot minlure bebop sitl linux px4-v2 px4-v4"
-                   ["APMrover2"]="navio raspilot minlure bebop sitl linux px4-v2"
-                   ["AntennaTracker"]="navio raspilot minlure bebop sitl linux px4-v2"
+build_platforms=(  ["ArduPlane"]="navio2 raspilot minlure bebop sitl linux px4-v2"
+                   ["ArduCopter"]="navio2 raspilot minlure bebop sitl linux px4-v2 px4-v4"
+                   ["APMrover2"]="navio2 raspilot minlure bebop sitl linux px4-v2"
+                   ["AntennaTracker"]="navio2 raspilot minlure bebop sitl linux px4-v2"
                    ["Tools/Replay"]="linux")
 
-build_concurrency=(["navio"]="-j2"
+build_concurrency=(["navio2"]="-j2"
                    ["raspilot"]="-j2"
                    ["minlure"]="-j2"
                    ["bebop"]="-j2"