diff --git a/bin/build-all.sh b/bin/build-all.sh
index 7e0be8e22..323e51f79 100755
--- a/bin/build-all.sh
+++ b/bin/build-all.sh
@@ -4,10 +4,17 @@ set -e
 
 source bin/version.sh
 
-COUNTRIES="US EU CN JP"
+# COUNTRIES="US EU CN JP"
+COUNTRIES=US
 
 SRCMAP=.pio/build/esp32/output.map
 SRCBIN=.pio/build/esp32/firmware.bin
+OUTDIR=release/latest
+
+# We keep all old builds (and their map files in the archive dir)
+ARCHIVEDIR=release/archive 
+
+rm -f $OUTDIR/firmware*
 
 for COUNTRY in $COUNTRIES; do 
 
@@ -18,16 +25,19 @@ for COUNTRY in $COUNTRIES; do
     echo "Building with $PLATFORMIO_BUILD_FLAGS"
     rm -f $SRCBIN $SRCMAP
     pio run # -v
-    cp $SRCBIN release/firmware-TBEAM-$COUNTRY-$VERSION.bin
-    cp $SRCMAP release/firmware-TBEAM-$COUNTRY-$VERSION.map
+    cp $SRCBIN $OUTDIR/firmware-TBEAM-$COUNTRY-$VERSION.bin
+    cp $SRCMAP $ARCHIVEDIR/firmware-TBEAM-$COUNTRY-$VERSION.map
 
     export PLATFORMIO_BUILD_FLAGS="-DHELTEC_LORA32 $COMMONOPTS"
     rm -f $SRCBIN $SRCMAP
     pio run # -v
-    cp $SRCBIN release/firmware-HELTEC-$COUNTRY-$VERSION.bin
-    cp $SRCMAP release/firmware-HELTEC-$COUNTRY-$VERSION.map
+    cp $SRCBIN $OUTDIR/firmware-HELTEC-$COUNTRY-$VERSION.bin
+    cp $SRCMAP $ARCHIVEDIR/firmware-HELTEC-$COUNTRY-$VERSION.map
 done
 
-zip release/firmware-$VERSION.zip release/firmware-*-$VERSION.bin
+# keep the bins in archive also
+cp $OUTDIR/firmware* $ARCHIVEDIR
+
+zip $ARCHIVEDIR/firmware-$VERSION.zip $OUTDIR/firmware-*-$VERSION.bin
 
 echo BUILT ALL
\ No newline at end of file