diff --git a/testing/taskcluster/tasks/builds/b2g_desktop_base.yml b/testing/taskcluster/tasks/builds/b2g_desktop_base.yml
index 9a9f7f8f63c8..8e8b8a5b8008 100644
--- a/testing/taskcluster/tasks/builds/b2g_desktop_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_desktop_base.yml
@@ -2,7 +2,7 @@ $inherits:
   from: 'tasks/build.yml'
 task:
   metadata:
-    name: "[TC] B2G Desktop {{build_type}}"
+    name: "[TC] B2G Desktop ( {{build_type}} )"
     description: B2G Desktop {{build_type}}
 
   workerType: b2gbuild-desktop
@@ -21,8 +21,11 @@ task:
         buildbot_step 'Build' ./build-b2g-desktop.sh $HOME/workspace
 
   extra:
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
-      groupSymbol: tc
+      groupSymbol: "?"
       groupName: Submitted by taskcluster
       machine:
         platform: b2g-linux64
diff --git a/testing/taskcluster/tasks/tests/b2g_build_test.yml b/testing/taskcluster/tasks/tests/b2g_build_test.yml
index bbe0d0c93850..4afc6af88496 100644
--- a/testing/taskcluster/tasks/tests/b2g_build_test.yml
+++ b/testing/taskcluster/tasks/tests/b2g_build_test.yml
@@ -3,7 +3,7 @@ $inherits:
   from: 'tasks/test.yml'
 task:
   metadata:
-    name: '[TC] Gaia Build Test'
+    name: '[TC] - Gaia Build Test'
     description: Gaia Build Test test run
 
   payload:
@@ -29,6 +29,10 @@ task:
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
+      groupSymbol: "?"
       symbol: 'Gb'
       productName: b2g
diff --git a/testing/taskcluster/tasks/tests/b2g_build_unit.yml b/testing/taskcluster/tasks/tests/b2g_build_unit.yml
index 38e11224719c..4db5f8cb5470 100644
--- a/testing/taskcluster/tasks/tests/b2g_build_unit.yml
+++ b/testing/taskcluster/tasks/tests/b2g_build_unit.yml
@@ -3,7 +3,7 @@ $inherits:
   from: 'tasks/test.yml'
 task:
   metadata:
-    name: '[TC] Gaia Build Unit Test'
+    name: '[TC] - Gaia Build Unit Test'
     description: Gaia Build Unit Test
 
   payload:
@@ -28,6 +28,10 @@ task:
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
+      groupSymbol: "?"
       symbol: 'Gbu'
       productName: b2g
diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml b/testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml
index 00d220106022..f8cc6fd95bf4 100644
--- a/testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml
+++ b/testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml
@@ -3,7 +3,7 @@ $inherits:
   from: 'tasks/test.yml'
 task:
   metadata:
-    name: '[TC] Gaia JS Integration Test'
+    name: '[TC] - Gaia JS Integration Test'
     description: Gaia JS Integration Test run {{chunk}}
 
   payload:
@@ -31,9 +31,12 @@ task:
 
   extra:
     chunks:
-      total: 20
+      total: 30
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
       groupName: Gaia JS Integration Test
-      groupSymbol: tc-Gij
+      groupSymbol: Gij
       symbol: '{{chunk}}'
       productName: b2g
diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml
index 4b3bea367682..f5cc5f70a4f8 100644
--- a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml
+++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml
@@ -3,7 +3,7 @@ $inherits:
   from: 'tasks/test.yml'
 task:
   metadata:
-    name: '[TC] Gaia Python Accessibility Integration Tests'
+    name: '[TC] - Gaia Python Accessibility Integration Tests'
     description: Gaia Python Accessibility Integration Tests run {{chunk}}
 
   payload:
@@ -30,8 +30,11 @@ task:
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
       groupName: Gaia Python Integration Tests
-      groupSymbol: tc-Gip
+      groupSymbol: Gip
       symbol: 'a'
       productName: b2g
diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml
index c1aecb09c5ad..f467fddafbc9 100644
--- a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml
+++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml
@@ -3,7 +3,7 @@ $inherits:
   from: 'tasks/test.yml'
 task:
   metadata:
-    name: '[TC] Gaia Python Functional Integration Tests'
+    name: '[TC] - Gaia Python Functional Integration Tests'
     description: Gaia Python Functional Integration Tests run {{chunk}}
 
   payload:
@@ -34,9 +34,11 @@ task:
   extra:
     chunks:
       total: 3
-
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
       groupName: Gaia Python Integration Tests
-      groupSymbol: tc-Gip
+      groupSymbol: Gip
       symbol: 'f{{chunk}}'
       productName: b2g
diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml
index 06c564cf39f6..60285de79c65 100644
--- a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml
+++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml
@@ -3,7 +3,7 @@ $inherits:
   from: 'tasks/test.yml'
 task:
   metadata:
-    name: '[TC] Gaia Python Integration Unit Tests'
+    name: '[TC] - Gaia Python Integration Unit Tests'
     description: Gaia Python Integration Unit Tests run {{chunk}}
 
   payload:
@@ -30,8 +30,11 @@ task:
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
       groupName: Gaia Python Integration Tests
-      groupSymbol: tc-Gip
+      groupSymbol: Gip
       symbol: 'u'
       productName: b2g
diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_unit.yml b/testing/taskcluster/tasks/tests/b2g_gaia_unit.yml
index 4a5242cc71cb..c59e7165d8ee 100644
--- a/testing/taskcluster/tasks/tests/b2g_gaia_unit.yml
+++ b/testing/taskcluster/tasks/tests/b2g_gaia_unit.yml
@@ -29,6 +29,10 @@ task:
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
       symbol: 'Gu'
+      groupSymbol: "?"
       productName: b2g
diff --git a/testing/taskcluster/tasks/tests/b2g_linter.yml b/testing/taskcluster/tasks/tests/b2g_linter.yml
index 3d2f4177a4bd..e003abcf8889 100644
--- a/testing/taskcluster/tasks/tests/b2g_linter.yml
+++ b/testing/taskcluster/tasks/tests/b2g_linter.yml
@@ -3,7 +3,7 @@ $inherits:
   from: 'tasks/test.yml'
 task:
   metadata:
-    name: '[TC] Gaia Linter'
+    name: '[TC] - Gaia Linter'
     description: Linter Test
 
   payload:
@@ -27,6 +27,10 @@ task:
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
+      groupSymbol: "?"
       symbol: 'Li'
       productName: 'b2g'