diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 055e084f..8e397f1d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -91,7 +91,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.env }}.bin
-        path: .pio/build/${{ matrix.env }}/firmware.bin
+        path: .pio/build/${{ matrix.env }}/*.bin
 
   release:
     name: Upload release assets
@@ -114,14 +114,23 @@ jobs:
           mv "$image" "$board"
         done
 
+    - name: Get the bootloader and partition files
+      run: |
+        for i in openevse_wifi_tft_v1:16mb openevse_wifi_v1:4mb; do
+          env=$(cut -f1 -d: <<< $i)
+          name=$(cut -f2 -d: <<< $i)
+          mv artifacts/$env.bin/bootloader.bin bootloader_$name.bin
+          mv artifacts/$env.bin/partitions.bin partitions_$name.bin
+        done
+
     - name: Upload assets to latest release
       if: github.ref_name == 'master'
-      uses: "marvinpinto/action-automatic-releases@latest"
+      uses: "softprops/action-gh-release@v2"
       with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: latest
         prerelease: true
-        title: Development Build
+        tag_name: latest
+        name: Development Build
+        generate_release_notes: true
         files: |
           *.bin