diff --git a/taskcluster/ci/beetmover-l10n/kind.yml b/taskcluster/ci/beetmover-l10n/kind.yml
index 5574b0807381..4e0b2716172f 100644
--- a/taskcluster/ci/beetmover-l10n/kind.yml
+++ b/taskcluster/ci/beetmover-l10n/kind.yml
@@ -17,3 +17,5 @@ only-for-attributes:
 
 not-for-build-platforms:
    - macosx64-nightly/opt
+   - win32-nightly/opt
+   - win64-nightly/opt
diff --git a/taskcluster/ci/nightly-l10n-signing/kind.yml b/taskcluster/ci/nightly-l10n-signing/kind.yml
index cb6ca333df89..de559e1df7d3 100644
--- a/taskcluster/ci/nightly-l10n-signing/kind.yml
+++ b/taskcluster/ci/nightly-l10n-signing/kind.yml
@@ -14,7 +14,3 @@ kind-dependencies:
 
 only-for-attributes:
   - nightly
-
-not-for-build-platforms:
-   - win32-nightly/opt
-   - win64-nightly/opt
diff --git a/taskcluster/taskgraph/transforms/nightly_l10n_signing.py b/taskcluster/taskgraph/transforms/nightly_l10n_signing.py
index 0c620f20a048..c60ce4b94637 100644
--- a/taskcluster/taskgraph/transforms/nightly_l10n_signing.py
+++ b/taskcluster/taskgraph/transforms/nightly_l10n_signing.py
@@ -36,6 +36,27 @@ def make_signing_description(config, jobs):
                     'format': 'macapp',
                 }
             ]
+        elif 'win32' in dep_platform:
+            job_specs = [
+                {
+                    'artifacts': [
+                        'public/build/{locale}/target.zip',
+                        'public/build/{locale}/setup.exe',
+                        'public/build/{locale}/setup-stub.exe'
+                    ],
+                    'format': 'sha2signcode',
+                }
+            ]
+        elif 'win64' in dep_platform:
+            job_specs = [
+                {
+                    'artifacts': [
+                        'public/build/{locale}/target.zip',
+                        'public/build/{locale}/setup.exe',
+                    ],
+                    'format': 'sha2signcode',
+                }
+            ]
         elif 'linux' in dep_platform:
             job_specs = [
                 {