diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b9e06e0d02..befddcb51b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -225,9 +225,15 @@ jobs:
         uses: actions/checkout@v1
       - name: Build OpenRCT2
         shell: bash
-        run: . scripts/setenv && cd src/openrct2-android && ./gradlew app:assemblePR
+        run: |
+          . scripts/setenv
+          pushd src/openrct2-android
+            ./gradlew app:assemblePR
+          popd
+          mkdir -p artifacts
+          mv src/openrct2-android/app/build/outputs/apk/arm/pr/app-arm-pr.apk artifacts/openrct2.apk
       - name: Upload artifacts (CI)
         uses: actions/upload-artifact@v1
         with:
           name: "OpenRCT2-Android"
-          path: src/openrct2-android/app/build/outputs/apk
+          path: artifacts
diff --git a/src/openrct2-android/app/build.gradle b/src/openrct2-android/app/build.gradle
index 1904be2481..edd1a82e29 100644
--- a/src/openrct2-android/app/build.gradle
+++ b/src/openrct2-android/app/build.gradle
@@ -50,11 +50,13 @@ android {
     }
 
     flavorDimensions "version"
+    /*
     productFlavors {
         full {
             dimension "version"
         }
     }
+    */
 
     externalNativeBuild {
         cmake {
@@ -63,21 +65,25 @@ android {
     }
 
     productFlavors {
+        /*
         arm7 {
             ndk {
                 abiFilters 'armeabi-v7a'
             }
         }
+        */
         arm {
             ndk {
                 abiFilters 'armeabi-v7a', 'arm64-v8a'
             }
         }
+        /*
         x86 {
             ndk {
                 abiFilters 'x86', 'x86_64'
             }
         }
+        */
     }
 }