diff --git a/src/scenarios/helloandroid/pre.py b/src/scenarios/helloandroid/pre.py
index e4d1c42ba23..cfa45344373 100644
--- a/src/scenarios/helloandroid/pre.py
+++ b/src/scenarios/helloandroid/pre.py
@@ -14,31 +14,36 @@
 
 parser = ArgumentParser()
 parser.add_argument('--unzip', help='Unzip APK and report extracted tree', action='store_true', default=False)
+parser.add_argument(
+        '--apk-name',
+        dest='apk',
+        required=True,
+        type=str,
+        help='Name of the APK to setup (with .apk)')
 args = parser.parse_args()
 
 if not os.path.exists(PUBDIR):
     os.mkdir(PUBDIR)
-apknames = ['HelloAndroid.apk', 'HelloAndroidWithDiag.apk']
-for apkname in apknames:
-    apknamezip = '%s.zip' % (apkname)
-    if not os.path.exists(apkname):
-        getLogger().error('Cannot find %s' % (apkname))
-        exit(-1)
-    if args.unzip:
-        if not os.path.exists(apknamezip):
-            copyfile(apkname, apknamezip)
-
-        with ZipFile(apknamezip) as zip:
-            zip.extractall(os.path.join('.', PUBDIR))
-
-        assets_dir = os.path.join(PUBDIR, 'assets')
-        assets_zip = os.path.join(assets_dir, 'assets.zip')
-        with ZipFile(assets_zip) as zip:
-            zip.extractall(assets_dir)
-
-        os.remove(assets_zip)
-    else:
-        copyfile(apkname, os.path.join(PUBDIR, apkname))
+apkname = args.apk
+apknamezip = '%s.zip' % (apkname)
+if not os.path.exists(apkname):
+    getLogger().error('Cannot find %s' % (apkname))
+    exit(-1)
+if args.unzip:
+    if not os.path.exists(apknamezip):
+        copyfile(apkname, apknamezip)
+
+    with ZipFile(apknamezip) as zip:
+        zip.extractall(os.path.join('.', PUBDIR))
+
+    assets_dir = os.path.join(PUBDIR, 'assets')
+    assets_zip = os.path.join(assets_dir, 'assets.zip')
+    with ZipFile(assets_zip) as zip:
+        zip.extractall(assets_dir)
+
+    os.remove(assets_zip)
+else:
+    copyfile(apkname, os.path.join(PUBDIR, apkname))
 
 
 
diff --git a/src/scenarios/mauiandroid/pre.py b/src/scenarios/mauiandroid/pre.py
index f17b143a439..aed0d76c750 100644
--- a/src/scenarios/mauiandroid/pre.py
+++ b/src/scenarios/mauiandroid/pre.py
@@ -4,7 +4,7 @@
 import sys
 import os
 from zipfile import ZipFile
-from performance.logger import setup_loggers
+from performance.logger import setup_loggers, getLogger
 from shutil import copyfile
 from shared.precommands import PreCommands
 from shared.const import PUBDIR
@@ -14,12 +14,20 @@
 
 parser = ArgumentParser()
 parser.add_argument('--unzip', help='Unzip APK and report extracted tree', action='store_true', default=False)
+parser.add_argument(
+        '--apk-name',
+        dest='apk',
+        required=True,
+        type=str,
+        help='Name of the APK to setup')
 args = parser.parse_args()
 
-apkname = 'MauiAndroidDefault.apk'
+if not os.path.exists(PUBDIR):
+    os.mkdir(PUBDIR)
+apkname = args.apk
 apknamezip = '%s.zip' % (apkname)
 if not os.path.exists(apkname):
-    print('Cannot find %s' % (apkname))
+    getLogger().error('Cannot find %s' % (apkname))
     exit(-1)
 if args.unzip:
     if not os.path.exists(apknamezip):
@@ -35,7 +43,6 @@
 
     os.remove(assets_zip)
 else:
-    os.mkdir(PUBDIR)
     copyfile(apkname, os.path.join(PUBDIR, apkname))