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

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

--- a/taskcluster/taskgraph/transforms/nightly_l10n_signing.py
+++ b/taskcluster/taskgraph/transforms/nightly_l10n_signing.py
@@ -31,16 +31,37 @@ def make_signing_description(config, job
             ]
         elif 'macosx' in dep_platform:
             job_specs = [
                 {
                     'artifacts': ['public/build/{locale}/target.dmg'],
                     '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 = [
                 {
                     'artifacts': ['public/build/{locale}/target.tar.bz2'],
                     'format': 'gpg',
                 }, {
                     'artifacts': ['public/build/{locale}/target.complete.mar'],
                     'format': 'mar',