diff --git a/taskcluster/android_taskgraph/gradle.py b/taskcluster/android_taskgraph/gradle.py
index 20dfb2e1e1cb..b0299f9383be 100644
--- a/taskcluster/android_taskgraph/gradle.py
+++ b/taskcluster/android_taskgraph/gradle.py
@@ -10,13 +10,4 @@ def get_gradle_project(task):
         shipping_product = attributes.get("shipping-product", "")
         if shipping_product:
             return shipping_product
-
-        # TODO: Use only shipping-product attribute instead
-        treeherder_group = attributes.get("treeherder-group", "")
-        if "focus" in treeherder_group:
-            gradle_project = "focus"
-        elif "fenix" in treeherder_group:
-            gradle_project = "fenix"
-        else:
-            gradle_project = None
     return gradle_project
diff --git a/taskcluster/android_taskgraph/loader/build_config.py b/taskcluster/android_taskgraph/loader/build_config.py
index fdc2269d9fe5..abcdc223b4fa 100644
--- a/taskcluster/android_taskgraph/loader/build_config.py
+++ b/taskcluster/android_taskgraph/loader/build_config.py
@@ -42,8 +42,6 @@ def _get_components_tasks(config, for_build_type=None):
             "attributes": {
                 "build-type": build_type,
                 "component": component["name"],
-                # Treeherder group are capped at 25 chars
-                "treeherder-group": component["name"][:25],
             }
         }
         for component in get_components()
@@ -61,11 +59,7 @@ def _get_components_tasks(config, for_build_type=None):
 def _get_apks_tasks(config):
     not_for_apks = config.get("not-for-apks", [])
     tasks = {
-        apk["name"]: {
-            "attributes": {
-                "treeherder-group": apk["name"],
-            }
-        }
+        apk["name"]: {}
         for apk in get_apk_based_projects()
         if apk["name"] not in not_for_apks
     }
diff --git a/taskcluster/android_taskgraph/transforms/build_components.py b/taskcluster/android_taskgraph/transforms/build_components.py
index 094a9d6db456..55e1986e51a0 100644
--- a/taskcluster/android_taskgraph/transforms/build_components.py
+++ b/taskcluster/android_taskgraph/transforms/build_components.py
@@ -76,7 +76,7 @@ def interpolate_missing_values(config, tasks):
                 component=component,
                 nightlyVersion=nightly_version,
                 timestamp=timestamp,
-                treeherder_group=task["attributes"]["treeherder-group"],
+                treeherder_group=component[:25],
             )
 
         yield task
diff --git a/taskcluster/ci/build-samples-browser/kind.yml b/taskcluster/ci/build-samples-browser/kind.yml
index fde8e9ce7fc5..dbaeb8de3965 100644
--- a/taskcluster/ci/build-samples-browser/kind.yml
+++ b/taskcluster/ci/build-samples-browser/kind.yml
@@ -20,7 +20,6 @@ job-defaults:
         build-type: regular
         code-review: true
         component: samples-browser
-        treeherder-group: samples-browser
     dependencies:
         build-fat-aar: build-fat-aar-android-geckoview-fat-aar/opt
     description: Execute Gradle tasks for component "{component}"
@@ -42,7 +41,7 @@ job-defaults:
         kind: build
         platform: AC-android-all/opt
         tier: 1
-        symbol: '{treeherder_group}(B)'
+        symbol: 'samples-browser(B)'
     worker-type: b-linux-large-gcp
     worker:
         chain-of-trust: true
@@ -60,7 +59,7 @@ jobs:
                 - ':samples-browser:lintGeckoDebug'
 
     system:
-        attributes:
-            treeherder-group: samples-browser-system
         run:
             gradlew: [':samples-browser:assembleSystem']
+        treeherder:
+            symbol: 'samples-browser-system(B)'
diff --git a/taskcluster/docs/attributes.rst b/taskcluster/docs/attributes.rst
index 862f0504d4a6..5e725fc25942 100644
--- a/taskcluster/docs/attributes.rst
+++ b/taskcluster/docs/attributes.rst
@@ -483,10 +483,6 @@ component
 =========
 To do.
 
-treeherder-group
-================
-To do.
-
 aab
 ===
 To do.