--- a/taskcluster/ci/upload-symbols/kind.yml
+++ b/taskcluster/ci/upload-symbols/kind.yml
@@ -7,19 +7,16 @@ loader: taskgraph.loader.single_dep:load
 transforms:
     - taskgraph.transforms.upload_symbols:transforms
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - build
 
-only-for-attributes:
-    - nightly
-
 job-template:
     description: Upload Symbols
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 900
         env:
             ARTIFACT_TASKID: {"task-reference": "<build>"}
@@ -33,9 +30,12 @@ job-template:
         sparse-profile: upload-symbols
     optimization:
         only-if-dependencies-run: null
     scopes:
         - secrets:get:project/releng/gecko/build/level-{level}/gecko-symbol-upload
     run-on-projects:
         by-build-platform:
             .*devedition.*: ['mozilla-beta', 'maple']
-            default: ['all']
+            # Only upload symbols for nightlies on most branches.
+            .*(?<!-devedition)-nightly: ['all']
+            # Allow symbol upload for any build type on try.
+            default: ['try']

--- a/taskcluster/taskgraph/transforms/upload_symbols.py
+++ b/taskcluster/taskgraph/transforms/upload_symbols.py
@@ -28,28 +28,28 @@ def fill_template(config, tasks):
         task['worker']['env']['SYMBOL_SECRET'] = task['worker']['env']['SYMBOL_SECRET'].format(
             level=config.params['level'])
 
         build_platform = dep.attributes.get('build_platform')
         build_type = dep.attributes.get('build_type')
         attributes = task.setdefault('attributes', {})
         attributes['build_platform'] = build_platform
         attributes['build_type'] = build_type
-        if 'nightly' in build_platform:
+        if dep.attributes.get('nightly'):
             attributes['nightly'] = True
 
         treeherder = task.get('treeherder', {})
         th = dep.task.get('extra')['treeherder']
-        treeherder.setdefault('platform',
-                              "{}/{}".format(th['machine']['platform'],
-                                             build_type))
+        th_platform = dep.task['extra'].get('treeherder-platform',
+                                            "{}/{}".format(th['machine']['platform'], build_type))
+        treeherder.setdefault('platform', th_platform)
         treeherder.setdefault('tier', th['tier'])
         treeherder.setdefault('kind', th['jobKind'])
-        if dep.attributes.get('nightly'):
-            treeherder.setdefault('symbol', 'SymN')
-        else:
-            treeherder.setdefault('symbol', 'Sym')
+        # Disambiguate the treeherder symbol.
+        build_sym = th['symbol']
+        sym = 'Sym' + (build_sym[1:] if build_sym.startswith('B') else build_sym)
+        treeherder.setdefault('symbol', sym)
         task['treeherder'] = treeherder
 
         # clear out the stuff that's not part of a task description
         del task['dependent-task']
 
         yield task