diff --git a/scripts/shared-macmini/build-and-test.sh b/scripts/shared-macmini/build-and-test.sh
index f94a665bbd..3765d2d834 100755
--- a/scripts/shared-macmini/build-and-test.sh
+++ b/scripts/shared-macmini/build-and-test.sh
@@ -3,7 +3,7 @@
 # Build and test Smith on team's shared MacMini, then report results to a set of emails
 
 # Immediately fail upon error and update environment
-set -e
+set -eE
 source ~/.bash_profile
 
 # Variables
@@ -36,8 +36,8 @@ print_run_log cd $PROJECT_DIR
 
 # Update repo
 print_run_log git checkout develop
-print_run_log git pull
-print_run_log git submodule update --init --recursive
+print_run_log git deinit --force --all
+print_run_log git pull --recurse-submodules
 
 # Clear previous build(s)
 print_run_log rm -rf _smith_build_and_test*