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

--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -138,16 +138,42 @@ win64-dmd/opt:
     run:
         using: mozharness
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_firefox_windows_64_opt.py
         custom-build-variant-cfg: dmd
     run-on-projects: [ ]
 
+win32-nightly/opt:
+    description: "Win32 Nightly"
+    index:
+        product: firefox
+        job-name: win32-opt
+        type: nightly
+    attributes:
+        nightly: true
+    treeherder:
+        platform: windows2012-32/opt
+        symbol: tc(N)
+        tier: 2
+    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker:
+        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
+    run:
+        using: mozharness
+        script: mozharness/scripts/fx_desktop_build.py
+        config:
+            - builds/taskcluster_firefox_windows_32_opt.py
+            - disable_signing.py
+            - taskcluster_nightly.py
+    run-on-projects: []
+
 win64-nightly/opt:
     description: "Win64 Nightly"
     index:
         product: firefox
         job-name: win64-opt
         type: nightly
     attributes:
         nightly: true

--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -228,17 +228,17 @@ def target_tasks_mozilla_beta(full_task_
 
     def filter(task):
         if not standard_filter(task, parameters):
             return False
         platform = task.attributes.get('build_platform')
         if platform in ('linux64-pgo', 'linux-pgo', 'android-api-15-nightly',
                         'android-x86-nightly'):
             return False
-        if platform in ('macosx64-nightly', 'win64-nightly'):
+        if platform in ('macosx64-nightly', 'win64-nightly', 'win32-nightly'):
             # Don't do some nightlies on-push until it's ready.
             return False
         if platform in ('linux64', 'linux'):
             if task.attributes['build_type'] == 'opt' and \
                task.attributes.get('unittest_suite') != 'talos':
                 return False
         # skip l10n, beetmover, balrog
         if task.kind in [