diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 48fbbb3fb2..7703e45d01 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,23 +80,23 @@ jobs:
       - run: cmake --install build --prefix build/install
 
   android:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     steps:
       - uses: actions/checkout@v6
       - uses: lukka/get-cmake@latest
-      - name: Configure
+      - name: Build
         run: |
-          cmake -S . -B build/ --toolchain $ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake \
-          -D ANDROID_PLATFORM=29 \
-          -D CMAKE_ANDROID_ARCH_ABI=arm64-v8a \
-          -D CMAKE_ANDROID_STL_TYPE=c++_static \
-          -D ANDROID_USE_LEGACY_TOOLCHAIN_FILE=NO \
-          -D CMAKE_BUILD_TYPE=Release \
-          -D UPDATE_DEPS=ON \
-          -G "Ninja"
-      - run: cmake --build build
-      - run: cmake --install build --prefix build/install
+          ANDROID_NDK_ROOT=${ANDROID_NDK_LATEST_HOME} scripts/android.py \
+            --config Release \
+            --app-abi "arm64-v8a x86_64"
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: layers-${{ github.run_id }}
+          path: build-android/libs/lib/**/*
+          if-no-files-found: 'error'
 
   macos:
     runs-on: macos-latest