--- a/taskcluster/ci/repackage-signing/kind.yml
+++ b/taskcluster/ci/repackage-signing/kind.yml
@@ -10,8 +10,10 @@ transforms:
    - taskgraph.transforms.task:transforms
 
 kind-dependencies:
   - repackage
   - repackage-l10n
 
 only-for-build-platforms:
   - macosx64-nightly/opt
+  - win32-nightly/opt
+  - win64-nightly/opt

--- a/taskcluster/taskgraph/transforms/gecko_v2_whitelist.py
+++ b/taskcluster/taskgraph/transforms/gecko_v2_whitelist.py
@@ -74,16 +74,17 @@ JOB_NAME_WHITELIST = set([
     'sm-plain-opt',
     'sm-plaindebug-debug',
     'sm-rootanalysis-debug',
     'sm-tsan-opt',
     'win32-add-on-devel',
     'win32-clang-tidy',
     'win32-debug',
     'win32-nightly-repackage',
+    'win32-nightly-repackage-signing',
     'win32-noopt-debug',
     'win32-opt',
     'win32-pgo',
     'win32-st-an-debug',
     'win32-st-an-opt',
     'win32-dmd-opt',
     'win64-add-on-devel',
     'win64-clang-tidy',

--- a/taskcluster/taskgraph/transforms/repackage_signing.py
+++ b/taskcluster/taskgraph/transforms/repackage_signing.py
@@ -73,16 +73,38 @@ def make_repackage_signing_description(c
         upstream_artifacts = [{
             "taskId": {"task-reference": "<repackage>"},
             "taskType": "repackage",
             "paths": [
                 "public/build/{}target.complete.mar".format(locale_str),
             ],
             "formats": ["mar"]
         }]
+        if 'win' in dep_job.attributes.get('build_platform'):
+            upstream_artifacts.append({
+                "taskId": {"task-reference": "<repackage>"},
+                "taskType": "repackage",
+                "paths": [
+                    "public/build/{}target.installer.exe".format(locale_str),
+                ],
+                "formats": ["sha2signcode"]
+            })
+            scopes.append("project:releng:signing:format:sha2signcode")
+
+            # Stub installer is only generated on win32
+            if '32' in dep_job.attributes.get('build_platform'):
+                upstream_artifacts.append({
+                    "taskId": {"task-reference": "<repackage>"},
+                    "taskType": "repackage",
+                    "paths": [
+                        "public/build/{}target.stub-installer.exe".format(locale_str),
+                    ],
+                    "formats": ["sha2signcodestub"]
+                })
+                scopes.append("project:releng:signing:format:sha2signcodestub")
 
         task = {
             'label': label,
             'description': "Repackage signing {} ".format(
                 dep_job.task["metadata"]["description"]),
             'worker-type': "scriptworker-prov-v1/signing-linux-v1",
             'worker': {'implementation': 'scriptworker-signing',
                        'upstream-artifacts': upstream_artifacts,