diff --git a/.gitea/workflows/capacitor-android.yml b/.gitea/workflows/capacitor-android.yml
index bf2a664..43074e4 100644
--- a/.gitea/workflows/capacitor-android.yml
+++ b/.gitea/workflows/capacitor-android.yml
@@ -8,7 +8,7 @@ on:
         default: '22.17'
       java-version:
         type: string
-        default: '17'
+        default: '21'
       runner:
         type: string
         default: 'ubuntu-latest'
@@ -125,8 +125,8 @@ jobs:
         if: inputs.output-format == 'apk'
         uses: https://gitea.com/actions/upload-artifact@v3
         with:
-          name: android-${{ inputs.build-type }}-apk
-          path: android/app/build/outputs/apk/${{ inputs.build-type }}/*.apk
+          name: android-${{ inputs.build-type || 'debug' }}-apk
+          path: android/app/build/outputs/apk/${{ inputs.build-type || 'debug' }}/*.apk
           retention-days: 14
 
       - name: Upload AAB artifact
@@ -136,3 +136,12 @@ jobs:
           name: android-release-aab
           path: android/app/build/outputs/bundle/release/*.aab
           retention-days: 14
+
+      - name: Upload Gradle build reports
+        if: always()
+        uses: https://gitea.com/actions/upload-artifact@v3
+        with:
+          name: gradle-build-reports
+          path: android/build/reports/
+          retention-days: 7
+          if-no-files-found: ignore