diff --git a/.cron.yml b/.cron.yml
index faef2cc8e4d3..b0dbc4dcce11 100644
--- a/.cron.yml
+++ b/.cron.yml
@@ -38,11 +38,21 @@ jobs:
           - date
       when: [] # never (hook only)
 
-    - name: nightly-desktop-win
+    - name: nightly-desktop-win32
       job:
           type: decision-task
-          treeherder-symbol: Nd-Win
-          target-tasks-method: nightly_win
+          treeherder-symbol: Nd-win32
+          target-tasks-method: nightly_win32
+      run-on-projects:
+          - mozilla-central
+          - date
+      when: [] # never (hook only)
+
+    - name: nightly-desktop-win64
+      job:
+          type: decision-task
+          treeherder-symbol: Nd-win64
+          target-tasks-method: nightly_win64
       run-on-projects:
           - mozilla-central
           - date
diff --git a/taskcluster/taskgraph/target_tasks.py b/taskcluster/taskgraph/target_tasks.py
index 0f9e4ab2aaed..44c967de009c 100644
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -350,8 +350,8 @@ def target_tasks_nightly_macosx(full_task_graph, parameters):
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
 
 
-@_target_task('nightly_win')
-def target_tasks_nightly_win(full_task_graph, parameters):
+@_target_task('nightly_win32')
+def target_tasks_nightly_win32(full_task_graph, parameters):
     """Select the set of tasks required for a nightly build of win32 and win64.
     The nightly build process involves a pipeline of builds, signing,
     and, eventually, uploading the tasks to balrog."""
@@ -359,7 +359,21 @@ def target_tasks_nightly_win(full_task_graph, parameters):
         platform = task.attributes.get('build_platform')
         if not filter_for_project(task, parameters):
             return False
-        if platform in ('win32-nightly', 'win64-nightly'):
+        if platform in ('win32-nightly', ):
+            return task.attributes.get('nightly', False)
+    return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
+
+
+@_target_task('nightly_win64')
+def target_tasks_nightly_win64(full_task_graph, parameters):
+    """Select the set of tasks required for a nightly build of win32 and win64.
+    The nightly build process involves a pipeline of builds, signing,
+    and, eventually, uploading the tasks to balrog."""
+    def filter(task):
+        platform = task.attributes.get('build_platform')
+        if not filter_for_project(task, parameters):
+            return False
+        if platform in ('win64-nightly', ):
             return task.attributes.get('nightly', False)
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
 
@@ -370,7 +384,8 @@ def target_tasks_nightly_desktop(full_task_graph, parameters):
     windows."""
     # Avoid duplicate tasks.
     return list(
-        set(target_tasks_nightly_win(full_task_graph, parameters))
+        set(target_tasks_nightly_win32(full_task_graph, parameters))
+        | set(target_tasks_nightly_win64(full_task_graph, parameters))
         | set(target_tasks_nightly_macosx(full_task_graph, parameters))
         | set(target_tasks_nightly_linux(full_task_graph, parameters))
     )