diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index a723f4e..741c0a3 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -7,24 +7,31 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/upload-artifact@v2
       with:
-        path: app/build/outputs/apk/debug/*.apk
+        submodules: 'recursive'
     - name: Setup JDK 1.8
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-
     - name: Setup Android SDK
-      uses: android-actions/setup-android@v2
-
+      uses: maxim-lobanov/setup-android-tools@v1
+      with:
+        packages: |
+          tools
+          platform-tools
+          build-tools-28.0.3
+          android-29
+        cache: true
     - name: Setup Android NDK
       run: |
         export NDK_VERSION=r19c
         curl -L https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux-x86_64.zip -O
         unzip -q android-ndk-${NDK_VERSION}-linux-x86_64.zip
         export ANDROID_NDK_HOME=`pwd`/android-ndk-${NDK_VERSION}
-
     - name: Build with Gradle
-      run: ./gradlew assembleDebug
+      run: ./gradlew --no-daemon assembleDebug
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        path: app/build/outputs/apk/debug/*.apk