diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ba880bd..2c3cb7c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,9 +21,9 @@ jobs:
     - name: Build firmware for ESP32-C3
       run: make BOARD=esp32:esp32:esp32c3
     - name: Build firmware for ESP32-S3 with QSPI PSRAM
-      run: make BOARD=esp32:esp32:esp32s3:CDCOnBoot=cdc,PSRAM=enabled && mv flix/build/esp32.esp32.esp32s3 flix/build/esp32.esp32.esp32s3.qspi
+      run: make BOARD=esp32:esp32:esp32s3:CDCOnBoot=cdc,PSRAM=enabled EXTRA=--output-dir=flix/build/esp32.esp32.esp32s3.qspi
     - name: Build firmware for ESP32-S3 with OPI PSRAM
-      run: make BOARD=esp32:esp32:esp32s3:CDCOnBoot=cdc,PSRAM=opi && mv flix/build/esp32.esp32.esp32s3 flix/build/esp32.esp32.esp32s3.opi
+      run: make BOARD=esp32:esp32:esp32s3:CDCOnBoot=cdc,PSRAM=opi EXTRA=--output-dir=flix/build/esp32.esp32.esp32s3.opi
     - name: Build firmware for ESP32-S3
       run: make BOARD=esp32:esp32:esp32s3
     - name: Upload binaries
diff --git a/Makefile b/Makefile
index a6f7dc7..564ec1a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ PORT := $(strip $(wildcard /dev/serial/by-id/usb-Silicon_Labs_CP21* /dev/serial/
 export ARDUINO_NETWORK_CONNECTION_TIMEOUT := 1h
 
 build: .core .libs
-	arduino-cli compile --fqbn $(BOARD) --build-property "build.core_debug_level=1" flix
+	arduino-cli compile --fqbn $(BOARD) --build-property "build.core_debug_level=1" flix $(EXTRA)
 
 upload: build
 	arduino-cli upload --fqbn $(BOARD) -p "$(PORT)" flix