--- a/taskcluster/ci/legacy/tasks/l10n.yml
+++ b/taskcluster/ci/legacy/tasks/l10n.yml
@@ -30,17 +30,17 @@ task:
 
     cache:
       level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
 
     # All builds share a common artifact directory for ease of uploading.
     artifacts:
       'public/build':
         type: directory
-        path: '/home/worker/workspace/build/upload/'
+        path: '/home/worker/artifacts/'
         expires:
           relative-datestamp: '1 year'
 
 
     env:
       # Common environment variables for checking out gecko
       GECKO_BASE_REPOSITORY: '{{base_repository}}'
       GECKO_HEAD_REPOSITORY: '{{head_repository}}'
@@ -61,8 +61,9 @@ task:
     build_type: '{{build_type}}'
     index:
       rank: {{pushlog_id}}
     treeherder:
       groupSymbol: tc
       groupName: Submitted by taskcluster
       tier: 2
       symbol: L10n
+      jobKind: build

--- a/testing/mozharness/configs/single_locale/tc_linux32.py
+++ b/testing/mozharness/configs/single_locale/tc_linux32.py
@@ -13,12 +13,12 @@ config = {
         "DIST": "%(abs_objdir)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "L10NBASEDIR": "../../l10n",
         "MOZ_MAKE_COMPLETE_MAR": "1",
         'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
     },
     "upload_env": {
         'UPLOAD_HOST': 'localhost',
-        'UPLOAD_PATH': '/home/worker/workspace/build/upload/',
+        'UPLOAD_PATH': '/home/worker/artifacts/',
     },
     "mozilla_dir": "src/",
 }

--- a/testing/mozharness/configs/single_locale/tc_linux64.py
+++ b/testing/mozharness/configs/single_locale/tc_linux64.py
@@ -13,12 +13,12 @@ config = {
         "DIST": "%(abs_objdir)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "L10NBASEDIR": "../../l10n",
         "MOZ_MAKE_COMPLETE_MAR": "1",
         'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
     },
     "upload_env": {
         'UPLOAD_HOST': 'localhost',
-        'UPLOAD_PATH': '/home/worker/workspace/build/upload/',
+        'UPLOAD_PATH': '/home/worker/artifacts/',
     },
     "mozilla_dir": "src/",
 }