--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -1,16 +1,16 @@
 win32/debug:
     description: "Win32 Debug"
     index:
         product: firefox
         job-name:
             gecko-v2: win32-debug
     treeherder:
-        platform: windowsxp/debug
+        platform: windows2012-32/debug
         symbol: tc(B)
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         implementation: generic-worker
         max-run-time: 7200
     run:
         using: mozharness
@@ -20,17 +20,17 @@ win32/debug:
 
 win32/opt:
     description: "Win32 Opt"
     index:
         product: firefox
         job-name:
             gecko-v2: win32-opt
     treeherder:
-        platform: windowsxp/opt
+        platform: windows2012-32/opt
         symbol: tc(B)
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         implementation: generic-worker
         max-run-time: 7200
     run:
         using: mozharness
@@ -40,17 +40,17 @@ win32/opt:
 
 win64/debug:
     description: "Win64 Debug"
     index:
         product: firefox
         job-name:
             gecko-v2: win64-debug
     treeherder:
-        platform: windows8-64/debug
+        platform: windows2012-64/debug
         symbol: tc(B)
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         implementation: generic-worker
         max-run-time: 7200
     run:
         using: mozharness
@@ -60,17 +60,17 @@ win64/debug:
 
 win64/opt:
     description: "Win64 Opt"
     index:
         product: firefox
         job-name:
             gecko-v2: win64-opt
     treeherder:
-        platform: windows8-64/opt
+        platform: windows2012-64/opt
         symbol: tc(B)
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         implementation: generic-worker
         max-run-time: 7200
     run:
         using: mozharness