diff --git a/selfdrive/test/setup_device_ci.sh b/selfdrive/test/setup_device_ci.sh
index 5c85312f1a..84dae25821 100755
--- a/selfdrive/test/setup_device_ci.sh
+++ b/selfdrive/test/setup_device_ci.sh
@@ -70,6 +70,7 @@ safe_checkout() {
   git checkout $GIT_COMMIT
   git clean -xdff
   git submodule sync
+  git submodule foreach --recursive "git reset --hard && git clean -xdff"
   git submodule update --init --recursive
   git submodule foreach --recursive "git reset --hard && git clean -xdff"
 
@@ -95,6 +96,7 @@ unsafe_checkout() {
   git reset --hard $GIT_COMMIT
   git clean -df
   git submodule sync
+  git submodule foreach --recursive "git reset --hard && git clean -df"
   git submodule update --init --recursive
   git submodule foreach --recursive "git reset --hard && git clean -df"