diff --git a/build/scenario/Makefile b/build/scenario/Makefile
index aafb398e8..64f65e8bf 100644
--- a/build/scenario/Makefile
+++ b/build/scenario/Makefile
@@ -1,11 +1,11 @@
 .PHONY: scenario_logger
 scenario_logger:
-	$(Q) make -j8 PLATFORM=simulator clean && make -j8 DEBUG=1 ARCH=x86_64 PLATFORM=simulator epsilon.headless.bin
+	$(Q) $(MAKE) PLATFORM=simulator clean && $(MAKE) DEBUG=1 ARCH=x86_64 PLATFORM=simulator epsilon.headless.bin
 	$(Q) cp output/debug/simulator/macos/x86_64/epsilon.headless.bin epsilon_scenario_logger.bin
 	@echo "Run ./epsilon_scenario_logger.bin --logAfter 0 < scenario.esc to log a scenario"
 
 .PHONY: scenario_creator
 scenario_creator:
-	$(Q) make -j8 PLATFORM=simulator clean && make -j8 DEBUG=1 ESCHER_LOG_EVENTS_BINARY=1 PLATFORM=simulator
+	$(Q) $(MAKE) PLATFORM=simulator clean && $(MAKE) DEBUG=1 ESCHER_LOG_EVENTS_BINARY=1 PLATFORM=simulator
 	$(Q) cp -R output/debug/simulator/macos/app/Payload/Epsilon.app epsilon_scenario_creator.app
 	@echo "Run lldb epsilon_scenario_creator.app then process launch -o scenario.esc to create a scenario"
diff --git a/build/targets.mak b/build/targets.mak
index 0f1d0bc16..cdc58c3e4 100644
--- a/build/targets.mak
+++ b/build/targets.mak
@@ -58,30 +58,30 @@ stable_release:
 	$(Q) rm -rf output/stable_release
 	$(Q) mkdir -p output/stable_release
 	$(Q) echo "BUILD_FIRMWARE    DEVICE N0110"
-	$(Q) make clean
-	$(Q) make -j8 epsilon.official.onboarding.dfu
+	$(Q) $(MAKE) clean
+	$(Q) $(MAKE) epsilon.official.onboarding.dfu
 	$(Q) cp output/release/device/n0110/epsilon.official.onboarding.dfu output/stable_release/epsilon.device.n0110.dfu
 	$(Q) echo "BUILD_FIRMWARE    DEVICE N0100"
-	$(Q) make MODEL=n0100 clean
-	$(Q) make -j8 MODEL=n0100 epsilon.official.onboarding.dfu
+	$(Q) $(MAKE) MODEL=n0100 clean
+	$(Q) $(MAKE) MODEL=n0100 epsilon.official.onboarding.dfu
 	$(Q) cp output/release/device/n0100/epsilon.official.onboarding.dfu output/stable_release/epsilon.device.n0100.dfu
 	$(Q) echo "BUILD_FIRMWARE    SIMULATOR WEB ZIP"
-	$(Q) make -j8 DEBUG=0 PLATFORM=simulator TARGET=web clean
-	$(Q) $(call source_emsdk); make -j8 DEBUG=0 PLATFORM=simulator TARGET=web output/release/simulator/web/simulator.official.zip
+	$(Q) $(MAKE) DEBUG=0 PLATFORM=simulator TARGET=web clean
+	$(Q) $(call source_emsdk); $(MAKE) DEBUG=0 PLATFORM=simulator TARGET=web output/release/simulator/web/simulator.official.zip
 	$(Q) cp output/release/simulator/web/simulator.official.zip output/stable_release/simulator.web.zip
 	$(Q) echo "BUILD_FIRMWARE    SIMULATOR WEB JS"
-	$(Q) $(call source_emsdk); make -j8 DEBUG=0 PLATFORM=simulator TARGET=web epsilon.official.js
+	$(Q) $(call source_emsdk); $(MAKE) DEBUG=0 PLATFORM=simulator TARGET=web epsilon.official.js
 	$(Q) cp output/release/simulator/web/epsilon.official.js output/stable_release/epsilon.js
 	$(Q) echo "BUILD_FIRMWARE    SIMULATOR WEB PYTHON JS"
-	$(Q) make -j8 DEBUG=0 PLATFORM=simulator TARGET=web clean
-	$(Q) $(call source_emsdk); make -j8 DEBUG=0 PLATFORM=simulator TARGET=web EPSILON_GETOPT=1 EPSILON_APPS=code epsilon.official.js
+	$(Q) $(MAKE) DEBUG=0 PLATFORM=simulator TARGET=web clean
+	$(Q) $(call source_emsdk); $(MAKE) DEBUG=0 PLATFORM=simulator TARGET=web EPSILON_GETOPT=1 EPSILON_APPS=code epsilon.official.js
 	$(Q) cp output/release/simulator/web/epsilon.official.js output/stable_release/epsilon.python.js
 	$(Q) echo "BUILD_FIRMWARE    SIMULATOR ANDROID"
-	$(Q) make -j8 PLATFORM=simulator TARGET=android clean
-	$(Q) make -j8 PLATFORM=simulator TARGET=android epsilon.official.apk
+	$(Q) $(MAKE) PLATFORM=simulator TARGET=android clean
+	$(Q) $(MAKE) PLATFORM=simulator TARGET=android epsilon.official.apk
 	$(Q) cp output/release/simulator/android/app/outputs/apk/release/android-release-unsigned.apk output/stable_release/epsilon.apk
 	$(Q) echo "BUILD_FIRMWARE    SIMULATOR IOS"
-	$(Q) make -j8 PLATFORM=simulator TARGET=ios clean
-	$(Q) make -j8 PLATFORM=simulator TARGET=ios IOS_PROVISIONNING_PROFILE="~/Downloads/NumWorks_Graphing_Calculator_Distribution.mobileprovision" output/release/simulator/ios/app/epsilon.official.ipa
+	$(Q) $(MAKE) PLATFORM=simulator TARGET=ios clean
+	$(Q) $(MAKE) PLATFORM=simulator TARGET=ios IOS_PROVISIONNING_PROFILE="~/Downloads/NumWorks_Graphing_Calculator_Distribution.mobileprovision" output/release/simulator/ios/app/epsilon.official.ipa
 	$(Q) cp output/release/simulator/ios/app/epsilon.official.ipa output/stable_release/epsilon.ipa
 endif