diff --git a/taskcluster/ci/release-partner-repack-beetmover/kind.yml b/taskcluster/ci/release-partner-repack-beetmover/kind.yml
index d3fde4c308a3..df4274ee8217 100644
--- a/taskcluster/ci/release-partner-repack-beetmover/kind.yml
+++ b/taskcluster/ci/release-partner-repack-beetmover/kind.yml
@@ -18,6 +18,7 @@ only-for-build-platforms:
    - macosx64-nightly/opt
    - win32-nightly/opt
    - win64-nightly/opt
+   - win64-aarch64-nightly/opt
 
 job-template:
    shipping-phase: promote
diff --git a/taskcluster/ci/release-partner-repack-repackage-signing/kind.yml b/taskcluster/ci/release-partner-repack-repackage-signing/kind.yml
index bb02ee062d4b..64e07c64d5b7 100644
--- a/taskcluster/ci/release-partner-repack-repackage-signing/kind.yml
+++ b/taskcluster/ci/release-partner-repack-repackage-signing/kind.yml
@@ -19,3 +19,4 @@ only-for-build-platforms:
    - macosx64-nightly/opt
    - win32-nightly/opt
    - win64-nightly/opt
+   - win64-aarch64-nightly/opt
diff --git a/taskcluster/ci/release-partner-repack-repackage/kind.yml b/taskcluster/ci/release-partner-repack-repackage/kind.yml
index a353dc520c6b..a598c391c73e 100644
--- a/taskcluster/ci/release-partner-repack-repackage/kind.yml
+++ b/taskcluster/ci/release-partner-repack-repackage/kind.yml
@@ -21,6 +21,7 @@ only-for-build-platforms:
    - macosx64-nightly/opt
    - win32-nightly/opt
    - win64-nightly/opt
+   - win64-aarch64-nightly/opt
 
 job-template:
    mozharness:
diff --git a/taskcluster/ci/release-partner-repack/kind.yml b/taskcluster/ci/release-partner-repack/kind.yml
index e5c460be5f5f..eab0ad615ff0 100644
--- a/taskcluster/ci/release-partner-repack/kind.yml
+++ b/taskcluster/ci/release-partner-repack/kind.yml
@@ -75,3 +75,10 @@ jobs:
          build_type: opt
          artifact_prefix: releng/partner
          nightly: true
+
+   win64-aarch64-nightly:
+      attributes:
+         build_platform: win64-aarch64-nightly
+         build_type: opt
+         artifact_prefix: releng/partner
+         nightly: true
diff --git a/taskcluster/taskgraph/transforms/partner_repack.py b/taskcluster/taskgraph/transforms/partner_repack.py
index f8a6777d7c7e..06c6eb8fcef3 100644
--- a/taskcluster/taskgraph/transforms/partner_repack.py
+++ b/taskcluster/taskgraph/transforms/partner_repack.py
@@ -66,10 +66,16 @@ def add_command_arguments(config, tasks):
                 all_locales.update(sub_partner.get('locales', []))
     for task in tasks:
         # add the MOZHARNESS_OPTIONS, eg version=61.0, build-number=1, platform=win64
+        if not task['attributes']['build_platform'].endswith('-nightly'):
+            raise Exception(
+                "Unexpected partner repack platform: {}".format(
+                    task['attributes']['build_platform'],
+                ),
+            )
         task['run']['options'] = [
             'version={}'.format(release_config['version']),
             'build-number={}'.format(release_config['build_number']),
-            'platform={}'.format(task['attributes']['build_platform'].split('-')[0]),
+            'platform={}'.format(task['attributes']['build_platform'].partition('-nightly')[0]),
         ]
         if task['extra']['limit-locales']:
             for locale in all_locales:
diff --git a/taskcluster/taskgraph/util/partners.py b/taskcluster/taskgraph/util/partners.py
index f329beb37f25..6c170842222d 100644
--- a/taskcluster/taskgraph/util/partners.py
+++ b/taskcluster/taskgraph/util/partners.py
@@ -126,6 +126,7 @@ TC_PLATFORM_PER_FTP = {
     'mac': 'macosx64-nightly',
     'win32': 'win32-nightly',
     'win64': 'win64-nightly',
+    'win64-aarch64': 'win64-aarch64-nightly',
 }
 
 TASKCLUSTER_PROXY_SECRET_ROOT = 'http://taskcluster/secrets/v1/secret'
@@ -240,7 +241,7 @@ def parse_config(data):
             l = str(l)
             key, value = l.split('=', 2)
             value = value.strip('\'"').rstrip('\'"')
-            if key in ('linux-i686', 'linux-x86_64', 'mac', 'win32', 'win64'):
+            if key in TC_PLATFORM_PER_FTP.keys():
                 if value.lower() == 'true':
                     config['platforms'].append(TC_PLATFORM_PER_FTP[key])
                 continue
@@ -367,6 +368,8 @@ def fix_partner_config(orig_config):
 def get_ftp_platform(platform):
     if platform.startswith('win32'):
         return 'win32'
+    elif platform.startswith('win64-aarch64'):
+        return 'win64-aarch64'
     elif platform.startswith('win64'):
         return 'win64'
     elif platform.startswith('macosx'):