diff --git a/.github/workflows/test_linux_sbc.yml b/.github/workflows/test_linux_sbc.yml
index 353d059b0421f..6e69b7362c8d4 100644
--- a/.github/workflows/test_linux_sbc.yml
+++ b/.github/workflows/test_linux_sbc.yml
@@ -159,6 +159,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/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
index a7930ea0a31d4..dab89f3af7708 100644
--- a/Tools/ardupilotwaf/boards.py
+++ b/Tools/ardupilotwaf/boards.py
@@ -1430,6 +1430,17 @@ def configure_env(self, cfg, env):
             CONFIG_HAL_BOARD_SUBTYPE='HAL_BOARD_SUBTYPE_LINUX_NAVIGATOR',
         )
 
+class navigator64(linux):
+    toolchain = 'aarch64-linux-gnu'
+
+    def configure_env(self, cfg, env):
+        super(navigator64, self).configure_env(cfg, env)
+
+        env.DEFINES.update(
+            CONFIG_HAL_BOARD_SUBTYPE='HAL_BOARD_SUBTYPE_LINUX_NAVIGATOR',
+        )
+
+
 class erleboard(linux):
     toolchain = 'arm-linux-gnueabihf'
 
diff --git a/Tools/scripts/board_list.py b/Tools/scripts/board_list.py
index 9758a1cc800ea..74f947e2be8d0 100755
--- a/Tools/scripts/board_list.py
+++ b/Tools/scripts/board_list.py
@@ -62,6 +62,7 @@ def __init__(self):
         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 ab91ce7c7b34a..cd20a58a53235 100755
--- a/Tools/scripts/build_ci.sh
+++ b/Tools/scripts/build_ci.sh
@@ -409,6 +409,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