diff --git a/.github/workflows/emulator.yml b/.github/workflows/emulator.yml
index 9ecd277f..868a1c95 100644
--- a/.github/workflows/emulator.yml
+++ b/.github/workflows/emulator.yml
@@ -73,7 +73,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-${{ matrix.api-level }}
+          key: avd-test-${{ matrix.api-level }}
 
       - name: Enable KVM
         if: matrix.api-level == 29 && steps.avd-cache.outputs.cache-hit != 'true'
@@ -91,6 +91,7 @@ jobs:
           target: default
           arch: x86_64
           api-level: ${{ matrix.api-level }}
+          disk-size: 8G
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: false
@@ -155,7 +156,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-${{ matrix.api-level }}
+          key: avd-test-${{ matrix.api-level }}
 
       - name: Test script=${{ matrix.script }} api-level=${{ matrix.api-level }}
         uses: reactivecircus/android-emulator-runner@v2
@@ -163,6 +164,7 @@ jobs:
           target: default
           arch: x86_64
           api-level: ${{ matrix.api-level }}
+          disk-size: 8G
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true