diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index 8679fef93..6c48bf675 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -251,12 +251,12 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           avd-name: test-${{ matrix.api-level }}
-          force-avd-creation: false
           arch: x86_64
           disk-size: 6000M
           heap-size: 600M
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          force-avd-creation: false
           disable-animations: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           script: echo "Generated AVD snapshot for caching."
 
       - name: Build projects and run instrumentation tests
@@ -265,14 +265,12 @@ jobs:
           api-level: ${{ matrix.api-level }}
           avd-name: test-${{ matrix.api-level }}
           arch: x86_64
-          force-avd-creation: false
-          disable-animations: true
           disk-size: 6000M
           heap-size: 600M
-          # && killall -INT crashpad_handler || true
-          # came from https://github.com/ReactiveCircus/android-emulator-runner/issues/385#issuecomment-2492035091
-          script: |
-            /usr/local/lib/android/sdk/platform-tools/adb -s emulator-5554 shell pm list packages -u | grep com.google.samples.apps.nowinandroid* | cut -d':' -f2 | tr '\r' ' ' | xargs -r -n1 -t adb uninstall; ./gradlew connectedDemoDebugAndroidTest --daemon && killall -INT crashpad_handler || true
+          force-avd-creation: false
+          disable-animations: true
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          script: ./gradlew connectedDemoDebugAndroidTest --daemon
 
       - name: Run local tests (including Roborazzi) for the combined coverage report (only API 30)
         if: matrix.api-level == 30