diff --git a/testing/docker/phone-builder/VERSION b/testing/docker/phone-builder/VERSION
index 81340c7e72d5..bbdeab6222cb 100644
--- a/testing/docker/phone-builder/VERSION
+++ b/testing/docker/phone-builder/VERSION
@@ -1 +1 @@
-0.0.4
+0.0.5
diff --git a/testing/docker/phone-builder/bin/build-phone.sh b/testing/docker/phone-builder/bin/build-phone.sh
index 7985f17dcc82..54bce6614543 100755
--- a/testing/docker/phone-builder/bin/build-phone.sh
+++ b/testing/docker/phone-builder/bin/build-phone.sh
@@ -7,6 +7,7 @@ test $GECKO_HEAD_REV # Should be an hg revision to pull down
 test $MOZHARNESS_REPOSITORY # mozharness repository
 test $MOZHARNESS_REV # mozharness revision
 test $TARGET
+test $VARIANT
 
 if ! validate_task.py; then
     echo "Not a valid task" >&2
@@ -49,6 +50,7 @@ fi
   --config b2g/taskcluster-phone.py \
   "$debug_flag" \
   --disable-mock \
+  --variant=$VARIANT \
   --work-dir=$OBJDIR/B2G \
   --log-level=debug \
   --target=$TARGET \
diff --git a/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml b/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml
new file mode 100644
index 000000000000..5c25bbd729e7
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml
@@ -0,0 +1,15 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+task:
+  scopes:
+    - 'docker-worker:cache:build-flame-kk-eng'
+  metadata:
+    name: B2G Flame KK Eng
+  payload:
+    cache:
+      build-flame-kk-eng: /home/worker/object-folder
+    env:
+      TARGET: 'flame-kk'
+      DEBUG: 0
+      VARIANT: eng
+
diff --git a/testing/taskcluster/tasks/builds/b2g_phone_base.yml b/testing/taskcluster/tasks/builds/b2g_phone_base.yml
index 3961e9e6d7d6..a68c1f9bdf96 100644
--- a/testing/taskcluster/tasks/builds/b2g_phone_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_phone_base.yml
@@ -7,6 +7,7 @@ task:
   payload:
     env:
       REPO_TRACE: 1
+      VARIANT: user
 
     # Emulators can take a very long time to build!
     maxRunTime: 14400