diff --git a/.github/workflows/test_linux_sbc.yml b/.github/workflows/test_linux_sbc.yml
index a66bc24de3..2ee58ae3c1 100644
--- a/.github/workflows/test_linux_sbc.yml
+++ b/.github/workflows/test_linux_sbc.yml
@@ -160,6 +160,10 @@ jobs:
             toolchain: armhf-musl
           - config: linux
             toolchain: base # GCC
+          - config: navigator64
+            toolchain: aarch64
+          - config: linux
+            toolchain: base # GCC
         exclude:
           - config: navigator
             toolchain: armhf
diff --git a/Tools/scripts/board_list.py b/Tools/scripts/board_list.py
index ab92794673..8e1b7f7cef 100755
--- a/Tools/scripts/board_list.py
+++ b/Tools/scripts/board_list.py
@@ -62,6 +62,7 @@ class BoardList(object):
         self.boards = [
             Board("erlebrain2"),
             Board("navigator"),
+            Board("navigator64"),
             Board("navio"),
             Board("navio2"),
             Board("edge"),
diff --git a/Tools/scripts/build_ci.sh b/Tools/scripts/build_ci.sh
index 4dbc66c4bf..72f1d37a54 100755
--- a/Tools/scripts/build_ci.sh
+++ b/Tools/scripts/build_ci.sh
@@ -395,6 +395,14 @@ for t in $CI_BUILD_TARGET; do
         continue
     fi
 
+    if [ "$t" == "navigator64" ]; then
+        echo "Building navigator64"
+        $waf configure --board navigator64 --toolchain=aarch64-linux-gnu
+        $waf sub
+        ./Tools/scripts/firmware_version_decoder.py -f build/navigator64/bin/ardusub --expected-hash $GIT_VERSION
+        continue
+    fi
+
     if [ "$t" == "replay" ]; then
         echo "Building replay"
         $waf configure --board sitl --debug --disable-scripting