diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index 056e7c4df..ab0d9a1bc 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -131,17 +131,6 @@ jobs:
       - name: Upgrade platformio
         run: |
           pio upgrade
-
-      - name: Pull OTA Firmware
-        uses: dsaltares/fetch-gh-release-asset@master
-        with:
-          repo: "meshtastic/Meshtastic-OTA"
-          file: "firmware.bin"
-          token: ${{ secrets.GITHUB_TOKEN }}
-          
-      - name: Move OTA Firmware
-        run: |
-          mv firmware.bin release/bleota.bin
           
       - name: Pull web ui
         uses: dsaltares/fetch-gh-release-asset@master
@@ -158,6 +147,17 @@ jobs:
 
       - name: Build ESP32
         run: bin/build-esp32.sh ${{ matrix.board }}
+         
+      - name: Pull OTA Firmware
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: "meshtastic/Meshtastic-OTA"
+          file: "firmware.bin"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          
+      - name: Move OTA Firmware
+        run: |
+          mv firmware.bin release/bleota.bin
 
       - name: Get release version string
         run: echo "::set-output name=version::$(./bin/buildinfo.py long)"