diff --git a/tools/build-companion-nightly.sh b/tools/build-companion-nightly.sh
index 24ab2c3545..fe5e940b19 100755
--- a/tools/build-companion-nightly.sh
+++ b/tools/build-companion-nightly.sh
@@ -133,7 +133,7 @@ do
             ;;
     esac
 
-    rm -f native/CMakeCache.txt
+    rm -f CMakeCache.txt native/CMakeCache.txt
     cmake ${BUILD_OPTIONS} "${SRCDIR}"
     cmake --build . --target native-configure
     cmake --build native -j${JOBS} --target libsimulator    
diff --git a/tools/build-gh.sh b/tools/build-gh.sh
index 2316e8edda..51a01b9dc2 100755
--- a/tools/build-gh.sh
+++ b/tools/build-gh.sh
@@ -150,6 +150,6 @@ do
     cmake --build . --target arm-none-eabi-configure
     cmake --build arm-none-eabi -j"${CORES}" --target ${FIRMARE_TARGET}
 
-    rm -f CMakeCache.txt
+    rm -f CMakeCache.txt arm-none-eabi/CMakeCache.txt
     mv arm-none-eabi/firmware.bin "../${fw_name}"
 done
diff --git a/tools/commit-tests.sh b/tools/commit-tests.sh
index ea243c939d..b990c85f10 100755
--- a/tools/commit-tests.sh
+++ b/tools/commit-tests.sh
@@ -136,9 +136,13 @@ do
     esac
 
     cmake ${BUILD_OPTIONS} "${SRCDIR}"
-    make -j"${CORES}" ${FIRMARE_TARGET}
-    make -j"${CORES}" libsimulator
-    make -j"${CORES}" tests-radio
 
-    rm -f CMakeCache.txt
+    cmake --build . --target arm-none-eabi-configure
+    cmake --build arm-none-eabi -j"${CORES}" --target ${FIRMARE_TARGET}
+
+    cmake --build . --target native-configure
+    cmake --build native -j"${CORES}" --target libsimulator
+    cmake --build native -j"${CORES}" --target tests-radio
+
+    rm -f CMakeCache.txt native/CMakeCache.txt arm-none-eabi/CMakeCache.txt
 done