diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml b/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml
index a3afbb6d369f3..b2552df0b02d9 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml
@@ -5,10 +5,12 @@ task:
   scopes:
     - 'docker-worker:cache:workspace-emulator-jb-debug'
   metadata:
-    name: '[TC] B2G Emulator JB Debug'
+    name: '[TC] B2G Emulator JB: (Debug)'
 
   extra:
+    # Disable "TC" prefix...
     treeherder:
+      groupSymbol: "?"
       collection:
         debug: true
       machine:
diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml
index 94c2815fbd436..8fa8b1c2a5836 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml
@@ -5,10 +5,15 @@ task:
   scopes:
     - 'docker-worker:cache:workspace-emulator-jb-opt'
   metadata:
-    name: '[TC] B2G JB Emulator Opt'
+    name: '[TC] B2G JB Emulator: (Opt)'
 
   extra:
+    treeherderEnv:
+      - production
+      - staging
+    # Disable "TC" prefix...
     treeherder:
+      groupSymbol: "?"
       machine:
         platform: b2g-emu-jb