deleted file mode 100644
--- a/testing/taskcluster/tasks/branches/cypress/job_flags.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-# For complete sample of all build and test jobs,
-# see <gecko>/testing/taskcluster/tasks/job_flags.yml
-
-$inherits:
-  from: tasks/branches/mozilla-central/job_flags.yml
-
-builds:
-  flame-kk:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_flame_kk_opt.yml
-  flame-kk-eng:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_flame_kk_eng.yml
-  aries-nightly:
-    platforms:
-      - b2g
-    types:
-      opt:
-        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:
-    allowed_build_tasks:
-      tasks/builds/b2g_flame_kk_opt.yml:
-        task: tasks/tests/b2g_build_test.yml
-      tasks/builds/b2g_flame_kk_eng.yml:
-        task: tasks/tests/b2g_build_test.yml
-  gaia-linter:
-    allowed_build_tasks:
-      tasks/builds/b2g_flame_kk_opt.yml:
-        task: tasks/tests/b2g_linter.yml
-      tasks/builds/b2g_flame_kk_eng.yml:
-        task: tasks/tests/b2g_linter.yml
-

--- a/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml
@@ -47,16 +47,30 @@ builds:
   emulator:
     platfoms:
       - b2g
     types:
       opt:
         task: tasks/builds/b2g_emulator_ics_opt.yml
       debug:
         task: tasks/builds/b2g_emulator_ics_debug.yml
+  aries-nightly:
+    platforms:
+      - b2g
+    types:
+      opt:
+        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:
   cppunit:
     allowed_build_tasks:
       tasks/builds/b2g_emulator_ics_opt.yml:
         task: tasks/tests/b2g_emulator_cpp_unit.yml
       tasks/builds/b2g_emulator_ics_debug.yml:
         task: tasks/tests/b2g_emulator_cpp_unit.yml

--- a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml
@@ -1,13 +1,13 @@
 $inherits:
   from: 'tasks/builds/b2g_aries_lightsaber_nightly_base.yml'
   variables:
     build_name: 'aries'
-    build_type: 'nightly-debug'
+    build_type: 'debug'
 task:
   metadata:
     name: '[TC] B2G Aries Nightly (userdebug)'
   scopes:
     - 'docker-worker:cache:build-aries-lightsaber-nightly-debug'
 
   payload:
     cache:

--- a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml
@@ -1,13 +1,13 @@
 $inherits:
   from: 'tasks/builds/b2g_aries_lightsaber_nightly_base.yml'
   variables:
     build_name: 'aries'
-    build_type: 'nightly-user'
+    build_type: 'opt'
 task:
   metadata:
     name: '[TC] B2G Aries Nightly (user)'
   scopes:
     - 'docker-worker:cache:build-aries-lightsaber-nightly-user'
 
   payload:
     cache: