diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index 4b5259b667..c6493f8fc1 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -30,8 +30,8 @@ function build_board {
             dest=$dest_dir/$descr$fw_tag.$ext
             if [ -r $build_dir/firmware.$ext ]; then
                 mv $build_dir/firmware.$ext $dest
-            else
-                # esp32 has micropython.elf and micropython.map
+            elif [ -r $build_dir/micropython.$ext ]; then
+                # esp32 has micropython.elf, etc
                 mv $build_dir/micropython.$ext $dest
             fi
         done
@@ -93,7 +93,7 @@ function build_esp32_boards {
         else
             if [ $mcu != esp32 ]; then
                 # build esp32-s2/s3/c3 based boards with IDF v4.4+
-                build_board $board_json $fw_tag $dest_dir bin elf map
+                build_board $board_json $fw_tag $dest_dir bin elf map uf2
             fi
         fi
     done