diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml
index 91d7a3e..b436c7f 100644
--- a/.github/workflows/flutter-build.yml
+++ b/.github/workflows/flutter-build.yml
@@ -26,12 +26,21 @@ jobs:
         include:
           - target: apk
             os: ubuntu-latest
+            upload_paths: |
+              build/app/outputs/flutter-apk/app-release.apk
+              build/app/outputs/bundle/release/app-release.aab
           - target: web
             os: ubuntu-latest
+            upload_paths: "netr-web.zip"
           - target: linux
             os: ubuntu-latest
+            upload_paths: "netr-linux-x64.tar.gz"
           - target: windows
             os: windows-latest
+            upload_paths: |
+              netr-windows-x64.zip
+              build/windows/x64/runner/Release/netr-windows-x64.msix
+
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
@@ -81,6 +90,11 @@ jobs:
         if: matrix.target == 'windows'
         run: flutter pub run msix:create
 
+      - name: Rename msix file to contain architecture
+        if: matrix.target == 'windows'
+        run: |
+          mv "build/windows/x64/runner/Release/netr.msix" "build/windows/x64/runner/Release/netr-windows-x64.msix"
+
       - name: Sign Android APK
         if: matrix.target == 'apk'
         uses: r0adkll/sign-android-release@v1
@@ -128,13 +142,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: base-${{ matrix.target }}-artifacts
-          path: |
-            ${{ matrix.target == 'apk' && 'build/app/outputs/flutter-apk/app-release.apk' || '' }}
-            ${{ matrix.target == 'apk' && 'build/app/outputs/bundle/release/app-release.aab' || '' }}
-            ${{ matrix.target == 'web' && 'netr-web.zip' || '' }}
-            ${{ matrix.target == 'linux' && 'netr-linux-x64.tar.gz' || '' }}
-            ${{ matrix.target == 'windows' && 'netr-windows-x64.zip' || '' }}
-            ${{ matrix.target == 'windows' && 'build/windows/runner/Release/*.msix' || '' }}
+          path: ${{ matrix.upload_paths }}
 
   build-linux-packages:
     name: Build Downstream Package (${{ matrix.target }})
@@ -325,7 +333,7 @@ jobs:
                               -name "netr-linux-x64.deb" -o \
                               -name "netr-linux-x64.deb.sig" -o \
                               -name "netr-windows-x64.zip" -o \
-                              -name "*.msix" \) \
+                              -name "netr-windows-x64.msix" \) \
                               -exec cp {} ./release-assets/ \;
 
       - name: Create GitHub Release