diff --git a/.github/workflows/app-CI.yml b/.github/workflows/app-CI.yml
index 02914465..378ff132 100644
--- a/.github/workflows/app-CI.yml
+++ b/.github/workflows/app-CI.yml
@@ -52,7 +52,7 @@ jobs:
         channel: ${{ env.FLUTTER_CHANNEL }}
         cache: true
     - name: Disable analytics
-      run: flutter config --no-analytics
+      run: flutter config --no-analytics --suppress-analytics
     - name: Generate mock code
       run: |
         flutter pub get
@@ -179,7 +179,13 @@ jobs:
         channel: ${{ env.FLUTTER_CHANNEL }}
         cache: true
     - name: Disable analytics
-      run: flutter config --no-analytics
+      run: flutter config --no-analytics --suppress-analytics
+    - name: Setup java
+      uses: actions/setup-java@v2
+      with:
+        java-version: "17"
+        distribution: "temurin"
+        cache: 'gradle'
     - name: Build apk
       run: flutter build apk --flavor github --debug
       working-directory: app
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index ea38c972..f3d9afc7 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -44,7 +44,13 @@ jobs:
         channel: ${{ env.FLUTTER_CHANNEL }}
         cache: true
     - name: Disable analytics
-      run: flutter config --no-analytics
+      run: flutter config --no-analytics --suppress-analytics
+    - name: Setup java
+      uses: actions/setup-java@v2
+      with:
+        java-version: "17"
+        distribution: "temurin"
+        cache: 'gradle'
     - name: Build apk
       run: flutter build apk --flavor github --debug
       working-directory: app
@@ -53,6 +59,7 @@ jobs:
         name: build-results
         path: app/build/app/outputs/flutter-apk
     - uses: mondeja/remove-labels-gh-action@v2
+      if: always()
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         labels: build-apk