diff --git a/wa/workloads/geekbench/__init__.py b/wa/workloads/geekbench/__init__.py
index 4962d281..d7baf1d2 100644
--- a/wa/workloads/geekbench/__init__.py
+++ b/wa/workloads/geekbench/__init__.py
@@ -53,8 +53,8 @@ class Geekbench(ApkUiautoWorkload):
     """
     summary_metrics = ['score', 'multicore_score']
 
-    supported_versions = ['4.4.2', '4.4.0', '4.3.4', '4.3.2', '4.3.1', '4.2.0', '4.0.1', '3.4.1', '3.0.0', '2']
-    package_names = ['com.primatelabs.geekbench', 'com.primatelabs.geekbench3', 'ca.primatelabs.geekbench2']
+    supported_versions = ['5', '4.4.2', '4.4.0', '4.3.4', '4.3.2', '4.3.1', '4.2.0', '4.0.1', '3.4.1', '3.0.0', '2']
+    package_names = ['com.primatelabs.geekbench5', 'com.primatelabs.geekbench', 'com.primatelabs.geekbench3', 'ca.primatelabs.geekbench2']
 
     begin_regex = re.compile(r'^\s*D/WebViewClassic.loadDataWithBaseURL\(\s*\d+\s*\)'
                              r'\s*:\s*(?P<content>\<.*)\s*$')
diff --git a/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk b/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk
index c1aaf03b..5eb8bb08 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 07085af3..cf31cab8 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
@@ -53,7 +53,8 @@ public class UiAutomation extends BaseUiAutomation {
         params = getParams();
         version = params.getString("version").split("\\.");
         majorVersion = Integer.parseInt(version[0]);
-        minorVersion = Integer.parseInt(version[1]);
+	if (version.length > 1)
+		minorVersion = Integer.parseInt(version[1]);
         isCorporate = params.getBoolean("is_corporate");
         loops = params.getInt("loops");
     }
@@ -140,7 +141,7 @@ public class UiAutomation extends BaseUiAutomation {
         scrollPage();
 
         String packageName = isCorporate ? "com.primatelabs.geekbench.*.corporate"
-                                         : "com.primatelabs.geekbench";
+                                         : "com.primatelabs.geekbench.*";
 
         UiObject runButton =
 	    mDevice.findObject(new UiSelector().resourceIdMatches(packageName + ":id/runCpuBenchmarks"));