diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2029fdc..14c0d1f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -94,8 +94,9 @@ jobs:
 
   android-emulator:
     name: Android Emulator Smoke
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     if: ${{ github.event_name == 'workflow_dispatch' }}
+    timeout-minutes: 25
     concurrency:
       group: ci-android-emulator-${{ github.ref }}
       cancel-in-progress: true
@@ -130,7 +131,8 @@ jobs:
         with:
           api-level: 35
           target: google_apis
-          arch: x86_64
+          arch: arm64-v8a
+          emulator-boot-timeout: 300
           working-directory: android
           script: ./gradlew connectedDebugAndroidTest