diff --git a/app/build.gradle b/app/build.gradle
index b72f804cb0..bce570894d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -468,22 +468,24 @@ Object readFileToJson(env){
     return null
 }
 
+
 def variantName() {
     if(gradle.startParameter.taskNames.size()>0) {
-        def taskName = gradle.startParameter.taskNames[0]
-        taskName = taskName.replace("Debug","")
-        taskName = taskName.replace("Release","")
-        if (taskName.endsWith("Qa")) {
-            return "qa"
-        } else if (taskName.endsWith("Online")) {
-            return "online"
-        } else if (taskName.endsWith("Demo")) {
-            return "demo"
-        } else {
-            return "qa"
+        for (String taskName : gradle.startParameter.taskNames) {
+            if (taskName.startsWith("assemble")) {
+                taskName = taskName.replace("Debug","")
+                taskName = taskName.replace("Release","")
+                if (taskName.endsWith("Qa")) {
+                    return "qa"
+                } else if (taskName.endsWith("Online")) {
+                    return "online"
+                } else if (taskName.endsWith("Demo")) {
+                    return "demo"
+                }
+            }
         }
-    }else {
-        return "qa"
     }
+    return "qa"
+
 }