diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6a7083a8f..1f3a82863 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -118,9 +118,12 @@ jobs:
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          script: |
-            adb uninstall "com.bumble.appyx.core.test"
-            adb uninstall "com.bumble.appyx.interop.ribs.test"
+          script: >
+            adb shell pm list packages | sed 's/package://g' | while read package; do
+              if [[ "$package" == "com.bumble.appyx.core.test" || "$package" == "com.bumble.appyx.interop.ribs.test" ]]; then
+                adb uninstall $package
+              fi
+            done  
             adb logcat > logcat.out &
             ./gradlew connectedCheck
       - name: Upload failed instrumentation artifacts