diff --git a/.gitea/workflows/build-apk.yml b/.gitea/workflows/build-apk.yml
index 0967c96..5e47225 100644
--- a/.gitea/workflows/build-apk.yml
+++ b/.gitea/workflows/build-apk.yml
@@ -38,8 +38,8 @@ jobs:
         working-directory: android
         run: ./gradlew assembleDebug
 
-      - name: Upload APK>
-        uses: actions/upload-artifact@v4
+      - name: Upload APK
+        uses: actions/upload-artifact@v3
         with:
           name: impostor-game-debug
           path: android/app/build/outputs/apk/debug/app-debug.apk
diff --git a/.github/workflows/build-apk.yml b/.github/workflows/build-apk.yml
index 106f1c1..19a7567 100644
--- a/.github/workflows/build-apk.yml
+++ b/.github/workflows/build-apk.yml
@@ -23,7 +23,12 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
+
+      - name: Verify Java Version
+        run: |
+          java -version
+          echo "JAVA_HOME=$JAVA_HOME"
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
@@ -36,9 +41,15 @@ jobs:
 
       - name: Build APK
         working-directory: android
-        run: ./gradlew assembleDebug
+        run: |
+          export JAVA_HOME="${JAVA_HOME}"
+          echo "Using Java from: $JAVA_HOME"
+          java -version
+          javac -version
+          ./gradlew --version
+          ./gradlew assembleDebug --no-daemon --stacktrace
 
-      - name: Upload APK>
+      - name: Upload APK
         uses: actions/upload-artifact@v4
         with:
           name: impostor-game-debug