diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index dab23fceb..2e499a383 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -213,7 +213,7 @@ jobs:
           heap-size: 600M
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: false
-          script: echo "Generated AVD snapshot for caching."; /usr/local/lib/android/sdk/platform-tools/adb -s emulator-5554 shell pm list packages -f | grep com.google.samples.apps.nowinandroid* | cut -d':' -f2 | tr '\r' ' ' | xargs -r -n1 -t adb uninstall;
+          script: echo "Generated AVD snapshot for caching."; /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;
 
       - name: Build projects and run instrumentation tests
         uses: reactivecircus/android-emulator-runner@v2
@@ -226,7 +226,7 @@ jobs:
           disk-size: 6000M
           heap-size: 600M
           script: |
-            /usr/local/lib/android/sdk/platform-tools/adb -s emulator-5554 shell pm list packages -f | grep com.google.samples.apps.nowinandroid* | cut -d':' -f2 | tr '\r' ' ' | xargs -r -n1 -t adb uninstall; ./gradlew connectedDemoDebugAndroidTest --daemon;
+            /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;
             # /usr/local/lib/android/sdk/platform-tools/adb -s emulator-5554 shell pm uninstall com.google.samples.apps.nowinandroid.demo.debug; 
 
       - name: Run local tests (including Roborazzi) for the combined coverage report (only API 30)