diff --git a/wa/workloads/pcmark/com.arm.wa.uiauto.pcmark.apk b/wa/workloads/pcmark/com.arm.wa.uiauto.pcmark.apk
index d600ed38..7d11c8ec 100644
Binary files a/wa/workloads/pcmark/com.arm.wa.uiauto.pcmark.apk and b/wa/workloads/pcmark/com.arm.wa.uiauto.pcmark.apk differ
diff --git a/wa/workloads/pcmark/uiauto/app/src/main/java/com/arm/wa/uiauto/pcmark/UiAutomation.java b/wa/workloads/pcmark/uiauto/app/src/main/java/com/arm/wa/uiauto/pcmark/UiAutomation.java
index a83ddfb7..a86af04c 100755
--- a/wa/workloads/pcmark/uiauto/app/src/main/java/com/arm/wa/uiauto/pcmark/UiAutomation.java
+++ b/wa/workloads/pcmark/uiauto/app/src/main/java/com/arm/wa/uiauto/pcmark/UiAutomation.java
@@ -104,14 +104,14 @@ public class UiAutomation extends BaseUiAutomation {
                 installtext.click();;
                 }
                 UiObject installed =
-                    mDevice.findObject(new UiSelector().description("RUN")
+                    mDevice.findObject(new UiSelector().text("RUN")
                         .className("android.view.View"));
-                installed.waitForExists(360000);
+                installed.waitForExists(180000);
                 if (!installed.exists()){
-                    UiObject installedtext =
-                        mDevice.findObject(new UiSelector().text("RUN")
+                    UiObject installeddesc =
+                        mDevice.findObject(new UiSelector().description("RUN")
                             .className("android.view.View"));
-                    installedtext.waitForExists(1000);
+                    installeddesc.waitForExists(1000);
                 }
     }
 
@@ -120,7 +120,7 @@ public class UiAutomation extends BaseUiAutomation {
         UiObject run =
             mDevice.findObject(new UiSelector().resourceId("CONTROL_PCMA_WORK_V2_DEFAULT")
                                                .className("android.view.View")
-                                               .childSelector(new UiSelector().index(1)
+                                               .childSelector(new UiSelector().text("RUN")
                                                .className("android.view.View")));
         if (run.exists()) {
             run.click();