diff --git a/taskcluster/taskgraph/target_tasks.py b/taskcluster/taskgraph/target_tasks.py
index e80dabc1c45f..0f9e4ab2aaed 100644
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -260,13 +260,23 @@ def target_tasks_mozilla_beta(full_task_graph, parameters):
         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'):
+        if platform in (
+                # On beta, Nightly builds are already PGOs
+                'linux-pgo', 'linux64-pgo',
+                'win32-pgo', 'win64-pgo',
+                'android-api-15-nightly', 'android-x86-nightly'
+                ):
             return False
-        if platform in ('linux64', 'linux'):
+
+        if platform in (
+                'linux', 'linux64',
+                'macosx64',
+                'win32', 'win64',
+                ):
             if task.attributes['build_type'] == 'opt' and \
                task.attributes.get('unittest_suite') != 'talos':
                 return False
+
         # skip l10n, beetmover, balrog
         if task.kind in [
             'balrog',