--- a/taskcluster/taskgraph/transforms/build_signing.py
+++ b/taskcluster/taskgraph/transforms/build_signing.py
@@ -64,28 +64,43 @@ def _generate_upstream_artifacts(build_p
         }]
     # XXX: Mac and Windows don't sign mars because internal aren't signed at
     # this stage of the release
     elif 'macosx' in build_platform:
         artifacts_specificities = [{
             'artifacts': ['public/build/target.dmg'],
             'format': 'macapp',
         }]
-    elif 'win' in build_platform:
+    elif 'win64' in build_platform:
         artifacts_specificities = [{
-            'artifacts': ['public/build/target.zip'],
+            'artifacts': [
+                'public/build/target.zip',
+                'public/build/setup.exe'
+            ],
             'format': 'sha2signcode',
         }]
-    else:
+    elif 'win32' in build_platform:
+        artifacts_specificities = [{
+            'artifacts': [
+                'public/build/target.zip',
+                'public/build/setup.exe',
+                ],
+            'format': 'sha2signcode',
+        }]
+        if is_nightly:
+            artifacts_specificities[0]['artifacts'] += ['public/build/setup-stub.exe']
+    elif 'linux' in build_platform:
         artifacts_specificities = [{
             'artifacts': ['public/build/target.tar.bz2'],
             'format': 'gpg',
         }, {
             'artifacts': ['public/build/update/target.complete.mar'],
             'format': 'mar',
         }]
+    else:
+        raise Exception("Platform not implemented for signing")
 
     return [{
         'taskId': {'task-reference': '<build>'},
         'taskType': 'build',
         'paths': specificity['artifacts'],
         'formats': [specificity['format']],
     } for specificity in artifacts_specificities]