diff --git a/workspace/makefile b/workspace/makefile
index c9f754ed0..bee20a7c2 100644
--- a/workspace/makefile
+++ b/workspace/makefile
@@ -15,6 +15,7 @@ endif
 .PHONY: all
 
 all:
+	set -e
 	cd ./$(PLATFORM)/wifimanager && make
 	cd ./$(PLATFORM)/libmsettings && make
 	cd ./$(PLATFORM) && make early # eg. other libs
diff --git a/workspace/tg5040/makefile b/workspace/tg5040/makefile
index ef98a1076..b89037efb 100644
--- a/workspace/tg5040/makefile
+++ b/workspace/tg5040/makefile
@@ -20,7 +20,7 @@ all: readmes
 
 early: $(REQUIRES_EVTEST) $(REQUIRES_JSTEST) $(REQUIRES_UNZIP60) $(REQUIRES_FILEMGR)
 	mkdir -p other
-	cd $(REQUIRES_FILEMGR) && make -j
+	cd $(REQUIRES_FILEMGR) && make
 	cd $(REQUIRES_EVTEST) && $(CROSS_COMPILE)gcc -o evtest evtest.c
 	cd $(REQUIRES_JSTEST) && $(CROSS_COMPILE)gcc -o jstest jstest.c
 	cd $(REQUIRES_UNZIP60) && make -f unix/Makefile.trimuismart unzip