diff --git a/wa/workloads/geekbench/__init__.py b/wa/workloads/geekbench/__init__.py
index 5c8066e1..9a5dd520 100644
--- a/wa/workloads/geekbench/__init__.py
+++ b/wa/workloads/geekbench/__init__.py
@@ -357,8 +357,8 @@ class GeekbenchCorproate(Geekbench):  # pylint: disable=too-many-ancestors
     name = "geekbench-corporate"
     is_corporate = True
     requires_network = False
-    supported_versions = ['4.1.0', '5.0.0']
-    package_names = ['com.primatelabs.geekbench4.corporate']
+    supported_versions = ['4.1.0', '4.3.4', '5.0.0']
+    package_names = ['com.primatelabs.geekbench4.corporate', 'com.primatelabs.geekbench5.corporate']
     activity = 'com.primatelabs.geekbench.HomeActivity'
 
     parameters = [
diff --git a/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk b/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk
index 3e44831a..cd90b060 100644
Binary files a/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk and b/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk differ
diff --git a/wa/workloads/geekbench/uiauto/app/src/main/java/com/arm/wa/uiauto/geekbench/UiAutomation.java b/wa/workloads/geekbench/uiauto/app/src/main/java/com/arm/wa/uiauto/geekbench/UiAutomation.java
index f7f20ce5..07085af3 100644
--- a/wa/workloads/geekbench/uiauto/app/src/main/java/com/arm/wa/uiauto/geekbench/UiAutomation.java
+++ b/wa/workloads/geekbench/uiauto/app/src/main/java/com/arm/wa/uiauto/geekbench/UiAutomation.java
@@ -139,11 +139,11 @@ public class UiAutomation extends BaseUiAutomation {
         uiDeviceSwipe(Direction.DOWN, 50);
         scrollPage();
 
-        String packageName = isCorporate ? "com.primatelabs.geekbench4.corporate"
+        String packageName = isCorporate ? "com.primatelabs.geekbench.*.corporate"
                                          : "com.primatelabs.geekbench";
+
         UiObject runButton =
-           mDevice.findObject(new UiSelector().resourceId(packageName + ":id/runCpuBenchmarks")
-                                         .className("android.widget.Button"));
+	    mDevice.findObject(new UiSelector().resourceIdMatches(packageName + ":id/runCpuBenchmarks"));
         if (!runButton.waitForExists(WAIT_TIMEOUT_5SEC)) {
             throw new UiObjectNotFoundException("Could not find Run button");
         }