diff --git a/app/build.gradle b/app/build.gradle
index b54b8e63fe..85611f4107 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,7 +47,7 @@ android.applicationVariants.all { variant ->
         // Our x86 builds need a higher version code to avoid installing ARM builds on an x86 device
         // with ARM compatibility mode.
 
-        if (variant.flavorName.contains("X86")) {
+        if (variant.flavorName.contains("x86")) {
             versionCode = versionCode + 1
         }// else variant.flavorName.contains("Arm")) use generated version code
 
diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py
index 06bbac53f9..8d3d37076a 100644
--- a/automation/taskcluster/lib/tasks.py
+++ b/automation/taskcluster/lib/tasks.py
@@ -4,7 +4,6 @@
 
 import datetime
 import json
-import os
 import taskcluster
 
 
@@ -134,8 +133,8 @@ class TaskBuilder(object):
             "metadata": {
                 "name": name,
                 "description": description,
-                "owner": "android-components-team@mozilla.com",
-                "source": "https://github.com/mozilla-mobile/fenix/tree/master/automation/taskcluster"
+                "owner": self.owner,
+                "source": self.source
             }
         }