--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -255,23 +255,33 @@ def target_tasks_mozilla_beta(full_task_
     """Select the set of tasks required for a promotable beta or release build
     of linux, plus android CI. The candidates build process involves a pipeline
     of builds and signing, but does not include beetmover or balrog jobs."""
 
     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'):
+        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', 'beetmover', 'beetmover-checksums', 'beetmover-l10n',
             'checksums-signing', 'nightly-l10n', 'nightly-l10n-signing',
             'push-apk', 'push-apk-breakpoint', 'beetmover-repackage',
             'beetmover-repackage-signing',
         ]:
             return False