diff --git a/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh b/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh
index 57e25a99b9d..72f1deda793 100755
--- a/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh
+++ b/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh
@@ -15,6 +15,15 @@ fi
 aws s3 cp s3://b2g-nightly-credentials/balrog_credentials .
 mar_file=b2g-${TARGET%%-*}-gecko-update.mar
 
+# We need different platform names for each variant (user, userdebug and
+# eng). We do not append variant suffix for "user" to keep compability with
+# verions already installed in the phones.
+if [ $VARIANT == "user" ]; then
+  PLATFORM=$TARGET
+else
+  PLATFORM=$TARGET-$VARIANT
+fi
+
 ./mozharness/scripts/b2g_lightsaber.py \
   --config b2g/taskcluster-lightsaber-nightly.py \
   --config balrog/staging.py \
@@ -29,7 +38,7 @@ mar_file=b2g-${TARGET%%-*}-gecko-update.mar
   --checkout-revision=$GECKO_HEAD_REV \
   --base-repo=$GECKO_BASE_REPOSITORY \
   --repo=$GECKO_HEAD_REPOSITORY \
-  --platform $TARGET \
+  --platform $PLATFORM \
   --complete-mar-url https://queue.taskcluster.net/v1/task/$TASK_ID/runs/$RUN_ID/artifacts/public/build/$mar_file \
 
 # Don't cache backups
diff --git a/testing/taskcluster/scripts/phone-builder/build-lightsaber.sh b/testing/taskcluster/scripts/phone-builder/build-lightsaber.sh
new file mode 100755
index 00000000000..ec010778eae
--- /dev/null
+++ b/testing/taskcluster/scripts/phone-builder/build-lightsaber.sh
@@ -0,0 +1,40 @@
+#! /bin/bash -vex
+
+. pre-build.sh
+
+# We need different platform names for each variant (user, userdebug and
+# eng). We do not append variant suffix for "user" to keep compability with
+# verions already installed in the phones.
+if [ $VARIANT == "user" ]; then
+  PLATFORM=$TARGET
+else
+  PLATFORM=$TARGET-$VARIANT
+fi
+
+./mozharness/scripts/b2g_lightsaber.py \
+  --config b2g/taskcluster-lightsaber.py \
+  "$debug_flag" \
+  --disable-mock \
+  --variant=$VARIANT \
+  --work-dir=$WORKSPACE/B2G \
+  --gaia-languages-file locales/languages_all.json \
+  --log-level=debug \
+  --target=$TARGET \
+  --b2g-config-dir=$TARGET \
+  --checkout-revision=$GECKO_HEAD_REV \
+  --base-repo=$GECKO_BASE_REPOSITORY \
+  --repo=$GECKO_HEAD_REPOSITORY
+
+# Don't cache backups
+rm -rf $WORKSPACE/B2G/backup-*
+
+# Move files into artifact locations!
+mkdir -p $HOME/artifacts
+
+mv $WORKSPACE/B2G/upload/sources.xml $HOME/artifacts/sources.xml
+mv $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
+mv $WORKSPACE/B2G/upload/b2g-*.android-arm.tar.gz $HOME/artifacts/b2g-android-arm.tar.gz
+mv $WORKSPACE/B2G/upload/${TARGET}.zip $HOME/artifacts/${TARGET}.zip
+mv $WORKSPACE/B2G/upload/gaia.zip $HOME/artifacts/gaia.zip
+
+ccache -s
diff --git a/testing/taskcluster/tasks/branches/base_job_flags.yml b/testing/taskcluster/tasks/branches/base_job_flags.yml
index 91b11673b85..3cdc533fc0a 100644
--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -23,6 +23,7 @@ flags:
     - dolphin-512
     - dolphin-512-eng
     - aries-nightly
+    - aries-eng
 
   tests:
     - cppunit
diff --git a/testing/taskcluster/tasks/branches/cypress/job_flags.yml b/testing/taskcluster/tasks/branches/cypress/job_flags.yml
index 1820ee53386..26bde745312 100644
--- a/testing/taskcluster/tasks/branches/cypress/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/cypress/job_flags.yml
@@ -23,7 +23,15 @@ builds:
       - b2g
     types:
       opt:
-        task: tasks/builds/b2g_aries_lightsaber_nightly.yml
+        task: tasks/builds/b2g_aries_lightsaber_nightly_opt.yml
+      debug:
+        task: tasks/builds/b2g_aries_lightsaber_nightly_debug.yml
+  aries-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_aries_lightsaber_eng.yml
 
 tests:
   gaia-build:
diff --git a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_eng.yml b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_eng.yml
new file mode 100644
index 00000000000..1406b6a09c3
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_eng.yml
@@ -0,0 +1,35 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'aries-eng'
+    build_type: 'opt'
+task:
+  workerType: flame-kk
+  scopes:
+    - 'docker-worker:cache:build-aries-eng'
+  metadata:
+    name: '[TC] B2G Aries Eng'
+
+  payload:
+    cache:
+      build-aries-eng: /home/worker/workspace
+    env:
+      TARGET: 'aries'
+      DEBUG: 0
+      VARIANT: eng
+      GAIA_OPTIMIZE: '1'
+      B2G_SYSTEM_APPS: '1'
+    command:
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        buildbot_step 'Build' ./build-lightsaber.sh $HOME/workspace
+  extra:
+    treeherder:
+      symbol: Be
+      groupSymbol: Aries
+      groupName: Aries Device Image
+      machine:
+        platform: b2g-device-image
+    locations:
+      img: 'private/build/aries.zip'
diff --git a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly.yml b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml
similarity index 70%
rename from testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly.yml
rename to testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml
index 345b9a097cb..f3ec44ca710 100644
--- a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml
@@ -1,18 +1,9 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'aries'
-    build_type: 'nightly'
 task:
   workerType: flame-kk
-  scopes:
-    - 'docker-worker:cache:build-aries-lightsaber-nightly'
-  metadata:
-    name: '[TC] B2G Aries Nightly'
 
   payload:
-    cache:
-      build-aries-lightsaber-nightly: /home/worker/workspace
     env:
       TARGET: 'aries'
       DEBUG: 0
diff --git a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml
new file mode 100644
index 00000000000..a315aa5d820
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml
@@ -0,0 +1,18 @@
+$inherits:
+  from: 'tasks/builds/b2g_aries_lightsaber_nightly_base.yml'
+  variables:
+    build_name: 'aries'
+    build_type: 'nightly-debug'
+task:
+  metadata:
+    name: '[TC] B2G Aries Nightly (userdebug)'
+  scopes:
+    - 'docker-worker:cache:build-aries-lightsaber-nightly-debug'
+
+  payload:
+    cache:
+      build-aries-lightsaber-nightly-debug: /home/worker/workspace
+    env:
+      VARIANT: userdebug
+      B2G_DEBUG: 1
+
diff --git a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml
new file mode 100644
index 00000000000..64d5d152e8c
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml
@@ -0,0 +1,17 @@
+$inherits:
+  from: 'tasks/builds/b2g_aries_lightsaber_nightly_base.yml'
+  variables:
+    build_name: 'aries'
+    build_type: 'nightly-user'
+task:
+  metadata:
+    name: '[TC] B2G Aries Nightly (user)'
+  scopes:
+    - 'docker-worker:cache:build-aries-lightsaber-nightly-user'
+
+  payload:
+    cache:
+      build-aries-lightsaber-nightly-user: /home/worker/workspace
+    env:
+      VARIANT: user
+