diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9b72e8e47..847ce2139 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,7 +46,22 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Debug APK
-          path: amethyst/build/outputs/apk/debug/app-debug.apk
+          path: amethyst/build/outputs/apk/**/debug/amethyst-play-universal-debug.apk
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: Debug APK
+          path: amethyst/build/outputs/apk/**/debug/amethyst-fdroid-universal-debug.apk
+
+      - name: Upload Compose Reports
+        uses: actions/upload-artifact@v4
+        with:
+          name: Build Reports
+          path: amethyst/build/compose_compiler
+
+      - name: Tests
+        run: ./gradlew test --no-daemon
 
       - name: Upload Test Results
         uses: actions/upload-artifact@v4