diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 9f45ba0dc..bc7da1edb 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,41 +1,56 @@
 name: Android CI
-# from https://medium.com/@wkrzywiec/github-actions-for-android-first-approach-f616c24aa0f9
 
 on:
-  - push
-  - pull_request
+  push:
+  pull_request:
 
 jobs:
-  test:
-    name: Test
+
+  ci-build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-      - name: Loading secrets
-        run: |
-          # not yet needed echo $gservices > ./app/google-services.json
-          rm ./app/google-services.json          
-          cp ./app/google-services-example.json ./app/google-services.json
-          rm ./app/src/main/res/values/mapbox-token.xml
-          cp ./app/special/mapbox-token.xml ./app/src/main/res/values/
-          # The following would not be valid XML, don't use yet
-          # echo $MAPBOXTOKEN > ./app/src/main/res/values/mapbox-token.xml
-          mkdir -p ~/.gradle
-          echo "MAPBOX_DOWNLOADS_TOKEN=$MAPBOXTOKEN" >>~/.gradle/gradle.properties
-        env:
-          gservices: ${{ secrets.gservices }}
-          MAPBOXTOKEN: ${{ secrets.MAPBOXTOKEN }}
-      - name: Mock curfirmware version for CI
-        run: |
-          rm ./app/src/main/res/values/curfirmwareversion.xml
-          cp ./app/special/curfirmwareversion.xml ./app/src/main/res/values/
-      - name: set up Java
-        uses: actions/setup-java@v2
-        with:
-          distribution: "adopt"
-          java-version: 16
-      - name: Unit tests
-        run: bash ./gradlew test --stacktrace
+
+    - name: Checkout code
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+
+    - name: Load secrets
+      run: |
+        rm ./app/google-services.json
+        echo $GSERVICES > ./app/google-services.json
+        rm ./app/src/main/res/values/mapbox-token.xml
+        echo "<resources>\n    <string name=\"mapbox_access_token\">$MAPBOXTOKEN</string>\n</resources>" > ./app/src/main/res/values/mapbox-token.xml
+        mkdir -p ~/.gradle
+        echo "MAPBOX_DOWNLOADS_TOKEN=$MAPBOXTOKEN" >>~/.gradle/gradle.properties
+      env:
+        GSERVICES: ${{ secrets.GSERVICES }}
+        MAPBOXTOKEN: ${{ secrets.MAPBOXTOKEN }}
+
+    - name: Mock curfirmware version for CI
+      run: |
+        rm ./app/src/main/res/values/curfirmwareversion.xml
+        cp ./app/special/curfirmwareversion.xml ./app/src/main/res/values/
+
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: 11
+        distribution: 'adopt'
+        cache: gradle
         
+    - name: Validate Gradle wrapper
+      uses: gradle/wrapper-validation-action@v1
+      
+    - name: Integration test
+      run: ./gradlew test --stacktrace
+
+    - name: Build debug APK
+      run: ./gradlew assembleDebug
+
+    - name: Upload APK
+      uses: actions/upload-artifact@v2
+      with:
+        name: app-debug
+        path: app/build/outputs/apk/debug/app-debug.apk
+        retention-days: 30
diff --git a/.gitignore b/.gitignore
index d8d02ed8f..48377fe8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,11 @@
 /captures
 .externalNativeBuild
 .cxx
-/app/release
\ No newline at end of file
+/app/release
+
+# Java KeyStore certificates
+*.jks
+keystore.properties
+
+# Mapbox token file
+/app/src/main/res/values/mapbox-token.xml