diff --git a/ports/build_all.py b/ports/build_all.py
index 7c72a7b..8d36524 100644
--- a/ports/build_all.py
+++ b/ports/build_all.py
@@ -44,7 +44,7 @@ for port in all_ports:
     all_boards.sort()
 
     for board in all_boards:
-        build_dir = "{}/_build/build-{}".format(port, board)
+        build_dir = "{}/_build/{}".format(port, board)
 
         start_time = time.monotonic()
         #subprocess.run("make -j -C {} BOARD={} clean".format(port, board), shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index d275b62..2c69b64 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -7,7 +7,7 @@
 PYTHON3 ?= python3
 
 # Build directory
-BUILD = _build/build-$(BOARD)
+BUILD = _build/$(BOARD)
 SELF_BUILD = self_update/$(BUILD)
 BIN = _bin/$(BOARD)
 TOP = ../..
diff --git a/ports/make.mk b/ports/make.mk
index 6fb23c4..5aa0b4f 100644
--- a/ports/make.mk
+++ b/ports/make.mk
@@ -34,7 +34,7 @@ ifeq ($(filter $(BOARD),$(BOARD_LIST)),)
 endif
 
 # Build directory
-BUILD = _build/build-$(BOARD)
+BUILD = _build/$(BOARD)
 BIN = _bin/$(BOARD)
 
 #-------------- Source files and compiler flags --------------