diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml
index 88d38ba..7a9da4a 100644
--- a/.github/workflows/pre-merge.yaml
+++ b/.github/workflows/pre-merge.yaml
@@ -21,7 +21,7 @@ jobs:
 #        run: ./gradlew preMerge --continue
 
   test_android:
-    runs-on: [ macos-14 ]
+    runs-on: [ ubuntu-latest ]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
@@ -42,7 +42,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd.v1-34
+          key: avd.v2-34
 
       - name: Create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
@@ -53,7 +53,7 @@ jobs:
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          arch: arm64-v8a
+          arch: x86_64
           disk-size: 3G
           ram-size: 3G
           heap-size: 1500M
@@ -75,7 +75,7 @@ jobs:
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot-save -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          arch: arm64-v8a
+          arch: x86_64
           disk-size: 3G
           ram-size: 3G
           heap-size: 1500M