diff --git a/.github/workflows/test_chibios.yml b/.github/workflows/test_chibios.yml
index 6fe345defd..ed16e57e2c 100644
--- a/.github/workflows/test_chibios.yml
+++ b/.github/workflows/test_chibios.yml
@@ -157,7 +157,7 @@ jobs:
             build-options-defaults-test,
             signing,
             CubeOrange-PPP,
-            CubeOrange-SOHW,
+            SOHW,
             Pixhawk6X-PPPGW,
         ]
         toolchain: [
diff --git a/Tools/scripts/build_ci.sh b/Tools/scripts/build_ci.sh
index c920cc2920..c82d184d47 100755
--- a/Tools/scripts/build_ci.sh
+++ b/Tools/scripts/build_ci.sh
@@ -327,9 +327,11 @@ for t in $CI_BUILD_TARGET; do
         continue
     fi
 
-    if [ "$t" == "CubeOrange-SOHW" ]; then
+    if [ "$t" == "SOHW" ]; then
         echo "Building CubeOrange-SOHW"
-        Tools/scripts/sitl-on-hardware/sitl-on-hw.py --vehicle plane --simclass Plane --board CubeOrange
+        Tools/scripts/sitl-on-hardware/sitl-on-hw.py --board CubeOrange --vehicle copter --simclass MultiCopter
+        echo "Building 6X-SOHW"
+        Tools/scripts/sitl-on-hardware/sitl-on-hw.py --board Pixhawk6X --vehicle plane --simclass Plane --frame plane-3d
         continue
     fi