--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -60,16 +60,17 @@ treeherder:
         'SM': 'Spidermonkey builds'
         'pub': 'APK publishing'
         'p': 'Partial generation'
         'ps': 'Partials signing'
         'Rel': 'Release promotion'
         'Snap': 'Snap image generation'
         'langpack': 'Langpack sigatures and uploads'
         'TPS': 'Sync tests'
+        'UV': 'Update verify'
 
 index:
     products:
         - 'firefox'
         - 'fennec'
         - 'mobile'
         - 'static-analysis'
         - 'devedition'

--- a/taskcluster/ci/release-secondary-update-verify/kind.yml
+++ b/taskcluster/ci/release-secondary-update-verify/kind.yml
@@ -44,58 +44,58 @@ job-defaults:
    extra:
       chunks: 12
 
 jobs:
    firefox-secondary-linux64:
       description: linux64 secondary channel update verify
       shipping-product: firefox
       treeherder:
-         symbol: UVS
+         symbol: UV(UVS)
          platform: linux64/opt
          kind: test
          tier: 1
       attributes:
          build_platform: linux64-nightly
 
    firefox-secondary-linux:
       description: linux secondary channel update verify
       shipping-product: firefox
       treeherder:
-         symbol: UVS
-         platform: linux/opt
+         symbol: UV(UVS)
+         platform: linux32/opt
          kind: test
          tier: 1
       attributes:
          build_platform: linux-nightly
 
    firefox-secondary-win64:
       description: win64 secondary channel update verify
       shipping-product: firefox
       treeherder:
-         symbol: UVS
-         platform: win64/opt
+         symbol: UV(UVS)
+         platform: windows2012-64/opt
          kind: test
          tier: 1
       attributes:
          build_platform: win64-nightly
 
    firefox-secondary-win32:
       description: win32 secondary channel update verify
       shipping-product: firefox
       treeherder:
-         symbol: UVS
-         platform: win32/opt
+         symbol: UV(UVS)
+         platform: windows2012-32/opt
          kind: test
          tier: 1
       attributes:
          build_platform: win32-nightly
 
    firefox-secondary-macosx64:
       description: macosx64 secondary channel update verify
       shipping-product: firefox
       treeherder:
-         symbol: UVS
-         platform: macosx64/opt
+         symbol: UV(UVS)
+         platform: osx-cross/opt
          kind: test
          tier: 1
       attributes:
          build_platform: macosx64-nightly

--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -89,17 +89,17 @@ job-defaults:
             mozilla-esr60: "60.0esr"
             default: null
 
 jobs:
    firefox-linux:
       shipping-product: firefox
       treeherder:
          symbol: UVC
-         platform: linux/opt
+         platform: linux32/opt
          kind: test
          tier: 1
       attributes:
          build_platform: linux-nightly
       extra:
          product: firefox
          platform: linux-i686
          updater-platform: linux-x86_64
@@ -145,17 +145,17 @@ jobs:
                maple: beta
                mozilla-beta: beta
                default: null
 
    firefox-macosx64:
       shipping-product: firefox
       treeherder:
          symbol: UVC
-         platform: macosx64/opt
+         platform: osx-cross/opt
          kind: test
          tier: 1
       attributes:
          build_platform: macosx64-nightly
       extra:
          product: firefox
          platform: mac
          updater-platform: linux-x86_64
@@ -173,17 +173,17 @@ jobs:
                maple: beta
                mozilla-beta: beta
                default: null
 
    firefox-win32:
       shipping-product: firefox
       treeherder:
          symbol: UVC
-         platform: win32/opt
+         platform: windows2012-32/opt
          kind: test
          tier: 1
       attributes:
          build_platform: win32-nightly
       extra:
          product: firefox
          platform: win32
          updater-platform: linux-x86_64
@@ -201,17 +201,17 @@ jobs:
                maple: beta
                mozilla-beta: beta
                default: null
 
    firefox-win64:
       shipping-product: firefox
       treeherder:
          symbol: UVC
-         platform: win64/opt
+         platform: windows2012-64/opt
          kind: test
          tier: 1
       attributes:
          build_platform: win64-nightly
       extra:
          product: firefox
          platform: win64
          updater-platform: linux-x86_64
@@ -229,17 +229,17 @@ jobs:
                maple: beta
                mozilla-beta: beta
                default: null
 
    devedition-linux:
       shipping-product: devedition
       treeherder:
          symbol: UVC
-         platform: linux-devedition/opt
+         platform: linux32-devedition/opt
          kind: test
          tier: 1
       attributes:
          build_platform: linux-devedition-nightly
       extra:
          product: firefox
          platform: linux-i686
          updater-platform: linux-x86_64
@@ -261,49 +261,49 @@ jobs:
          updater-platform: linux-x86_64
          channel: "aurora-localtest"
          include-version: devedition_hack
 
    devedition-macosx64:
       shipping-product: devedition
       treeherder:
          symbol: UVC
-         platform: macosx64-devedition/opt
+         platform: osx-cross-devedition/opt
          kind: test
          tier: 1
       attributes:
          build_platform: macosx64-devedition-nightly
       extra:
          product: firefox
          platform: mac
          updater-platform: linux-x86_64
          channel: "aurora-localtest"
          include-version: devedition_hack
 
    devedition-win32:
       shipping-product: devedition
       treeherder:
          symbol: UVC
-         platform: win32-devedition/opt
+         platform: windows2012-32-devedition/opt
          kind: test
          tier: 1
       attributes:
          build_platform: win32-devedition-nightly
       extra:
          product: firefox
          platform: win32
          updater-platform: linux-x86_64
          channel: "aurora-localtest"
          include-version: devedition_hack
 
    devedition-win64:
       shipping-product: devedition
       treeherder:
          symbol: UVC
-         platform: win64-devedition/opt
+         platform: windows2012-64-devedition/opt
          kind: test
          tier: 1
       attributes:
          build_platform: win64-devedition-nightly
       extra:
          product: firefox
          platform: win64
          updater-platform: linux-x86_64

--- a/taskcluster/ci/release-update-verify/kind.yml
+++ b/taskcluster/ci/release-update-verify/kind.yml
@@ -53,17 +53,17 @@ jobs:
                by-project:
                   birch: "release-localtest"
                   jamun: "beta-localtest"
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
                   default: "default"
       treeherder:
-         symbol: UV
+         symbol: UV(UV)
          platform: linux64/opt
          kind: test
          tier: 1
       attributes:
          build_platform: linux64-nightly
 
    firefox-linux:
       description: linux update verify
@@ -74,18 +74,18 @@ jobs:
                by-project:
                   birch: "release-localtest"
                   jamun: "beta-localtest"
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
                   default: "default"
       treeherder:
-         symbol: UV
-         platform: linux/opt
+         symbol: UV(UV)
+         platform: linux32/opt
          kind: test
          tier: 1
       attributes:
          build_platform: linux-nightly
 
    firefox-win64:
       description: win64 update verify
       shipping-product: firefox
@@ -95,18 +95,18 @@ jobs:
                by-project:
                   birch: "release-localtest"
                   jamun: "beta-localtest"
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
                   default: "default"
       treeherder:
-         symbol: UV
-         platform: win64/opt
+         symbol: UV(UV)
+         platform: windows2012-64/opt
          kind: test
          tier: 1
       attributes:
          build_platform: win64-nightly
 
    firefox-win32:
       description: win32 update verify
       shipping-product: firefox
@@ -116,18 +116,18 @@ jobs:
                by-project:
                   birch: "release-localtest"
                   jamun: "beta-localtest"
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
                   default: "default"
       treeherder:
-         symbol: UV
-         platform: win32/opt
+         symbol: UV(UV)
+         platform: windows2012-32/opt
          kind: test
          tier: 1
       attributes:
          build_platform: win32-nightly
 
    firefox-macosx64:
       description: macosx64 update verify
       shipping-product: firefox
@@ -137,84 +137,84 @@ jobs:
                by-project:
                   birch: "release-localtest"
                   jamun: "beta-localtest"
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
                   default: "default"
       treeherder:
-         symbol: UV
-         platform: macosx64/opt
+         symbol: UV(UV)
+         platform: osx-cross/opt
          kind: test
          tier: 1
       attributes:
          build_platform: macosx64-nightly
 
    devedition-linux64:
       description: linux64 update verify
       shipping-product: devedition
       worker:
          env:
             CHANNEL: "aurora-localtest"
       treeherder:
-         symbol: UV
+         symbol: UV(UV)
          platform: linux64-devedition/opt
          kind: test
          tier: 1
       attributes:
          build_platform: linux64-devedition-nightly
 
    devedition-linux:
       description: linux update verify
       shipping-product: devedition
       worker:
          env:
             CHANNEL: "aurora-localtest"
       treeherder:
-         symbol: UV
-         platform: linux-devedition/opt
+         symbol: UV(UV)
+         platform: linux32-devedition/opt
          kind: test
          tier: 1
       attributes:
          build_platform: linux-devedition-nightly
 
    devedition-win64:
       description: win64 update verify
       shipping-product: devedition
       worker:
          env:
             CHANNEL: "aurora-localtest"
       treeherder:
-         symbol: UV
-         platform: win64-devedition/opt
+         symbol: UV(UV)
+         platform: windows2012-64-devedition/opt
          kind: test
          tier: 1
       attributes:
          build_platform: win64-devedition-nightly
 
    devedition-win32:
       description: win32 update verify
       shipping-product: devedition
       worker:
          env:
             CHANNEL: "aurora-localtest"
       treeherder:
-         symbol: UV
-         platform: win32-devedition/opt
+         symbol: UV(UV)
+         platform: windows2012-32-devedition/opt
          kind: test
          tier: 1
       attributes:
          build_platform: win32-devedition-nightly
 
    devedition-macosx64:
       description: macosx64 update verify
       shipping-product: devedition
       worker:
          env:
             CHANNEL: "aurora-localtest"
       treeherder:
-         symbol: UV
-         platform: macosx64-devedition/opt
+         symbol: UV(UV)
+         platform: osx-cross-devedition/opt
          kind: test
          tier: 1
       attributes:
          build_platform: macosx64-devedition-nightly