diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ccc5e8a9f..a04b4ee51 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -11,18 +11,25 @@ jobs:
     name: "Release ${{ matrix.target }}"
     runs-on: ubuntu-latest
     steps:
-      - name: set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
       - name: Use debug signing
         run: mkdir -p ~/.gradle && echo -e "icsopenvpnDebugSign=true\norg.gradle.jvmargs=-Xmx2048M" > ~/.gradle/gradle.properties
       - name: Checkout the code
         uses: actions/checkout@v2
         with:
           submodules: true
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+          cache: 'gradle'
       - name: Build the app
         run: ./gradlew assemble${{ matrix.target }}Release
       - name: Run Unit tests
-        run: ./gradlew test${{ matrix.target }}ReleaseUnitTest
\ No newline at end of file
+        run: ./gradlew test${{ matrix.target }}ReleaseUnitTest
+
+      - name: Archive apk artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: mingw-unittest-${{matrix.target}}-ossl${{ matrix.osslver }}-tests
+          path: main/build/outputs/apk/**/*universal*.apk