diff --git a/.github/workflows/_job_cx-freeze-appimage.yml b/.github/workflows/_job_cx-freeze-appimage.yml
index a1a5b50f4..0fc395d40 100644
--- a/.github/workflows/_job_cx-freeze-appimage.yml
+++ b/.github/workflows/_job_cx-freeze-appimage.yml
@@ -15,7 +15,7 @@ jobs:
         include:
           - arch: arm64
             pyarch: arm64
-            os: ubuntu-22.04-arm
+            os: ubuntu-24.04-arm
           - arch: x86_64
             pyarch: x64
             os: ubuntu-22.04
diff --git a/.github/workflows/_job_cx-freeze-msi.yml b/.github/workflows/_job_cx-freeze-msi.yml
index 037fd007e..35317313c 100644
--- a/.github/workflows/_job_cx-freeze-msi.yml
+++ b/.github/workflows/_job_cx-freeze-msi.yml
@@ -9,8 +9,18 @@ on:
 
 jobs:
   build:
-    name: Package
-    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: arm64
+            pyarch: arm64
+            os: windows-11-arm
+          - arch: x86_64
+            pyarch: x64
+            os: windows-latest
+    name: Package ${{ matrix.arch }}
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v6
         with:
@@ -21,7 +31,7 @@ jobs:
           cache: pip
           python-version: '3.12'
           check-latest: true
-          architecture: x64
+          architecture: ${{ matrix.pyarch }}
       - name: Install build dependencies
         run: |
           pip3 install --upgrade cx_freeze ruff
@@ -43,10 +53,10 @@ jobs:
           SETUPTOOLS_SCM_PRETEND_VERSION: ${{ inputs.version }}
         run: |
           python3 freeze.py bdist_msi
-          mv dist/*.msi Rare-${{ inputs.version }}.msi
+          mv dist/*.msi Rare-${{ inputs.version }}-${{ matrix.arch }}.msi
 
       - name: Upload artifact
         uses: actions/upload-artifact@v5
         with:
-          name: Rare-${{ inputs.version }}.msi
-          path: Rare-${{ inputs.version }}.msi
+          name: Rare-${{ inputs.version }}-${{ matrix.arch }}.msi
+          path: Rare-${{ inputs.version }}-${{ matrix.arch }}.msi
diff --git a/.github/workflows/_job_nuitka-linux.yml b/.github/workflows/_job_nuitka-linux.yml
index 9ca5c83ee..8540be5e1 100644
--- a/.github/workflows/_job_nuitka-linux.yml
+++ b/.github/workflows/_job_nuitka-linux.yml
@@ -9,8 +9,18 @@ on:
 
 jobs:
   build:
-    name: Package
-    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: arm64
+            pyarch: arm64
+            os: ubuntu-24.04-arm
+          - arch: x86_64
+            pyarch: x64
+            os: ubuntu-22.04
+    name: Package ${{ matrix.arch }}
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v6
         with:
@@ -21,7 +31,7 @@ jobs:
           cache: pip
           python-version: '3.12'
           check-latest: true
-          architecture: x64
+          architecture: ${{ matrix.pyarch }}
       - name: Install build dependencies
         run: |
           pip3 install --upgrade nuitka ruff
@@ -87,10 +97,10 @@ jobs:
         run: |
           mv rare.dist Rare-${{ inputs.version }}
           python -c "import shutil; shutil.make_archive('Rare-${{ inputs.version }}', 'zip', '.', 'Rare-${{ inputs.version }}')"
-          mv Rare-${{ inputs.version }}.zip Rare-${{ inputs.version }}-linux.zip
+          mv Rare-${{ inputs.version }}.zip Rare-${{ inputs.version }}-${{ matrix.arch }}-linux.zip
 
       - name: Upload artifact
         uses: actions/upload-artifact@v5
         with:
-          name: Rare-${{ inputs.version }}-linux.zip
-          path: Rare-${{ inputs.version }}-linux.zip
+          name: Rare-${{ inputs.version }}-${{ matrix.arch }}-linux.zip
+          path: Rare-${{ inputs.version }}-${{ matrix.arch }}-linux.zip
diff --git a/.github/workflows/_job_nuitka-windows.yml b/.github/workflows/_job_nuitka-windows.yml
index 7cd96aa81..61d6cd896 100644
--- a/.github/workflows/_job_nuitka-windows.yml
+++ b/.github/workflows/_job_nuitka-windows.yml
@@ -9,8 +9,18 @@ on:
 
 jobs:
   build:
-    name: Package
-    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: arm64
+            pyarch: arm64
+            os: windows-11-arm
+          - arch: x86_64
+            pyarch: x64
+            os: windows-latest
+    name: Package ${{ matrix.arch }}
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v6
         with:
@@ -21,7 +31,7 @@ jobs:
           cache: pip
           python-version: '3.12'
           check-latest: true
-          architecture: x64
+          architecture: ${{ matrix.pyarch }}
       - name: Install build dependencies
         run: |
           pip3 install --upgrade nuitka ruff
@@ -85,10 +95,10 @@ jobs:
         run: |
           mv rare.dist Rare-${{ inputs.version }}
           python -c "import shutil; shutil.make_archive('Rare-${{ inputs.version }}', 'zip', '.', 'Rare-${{ inputs.version }}')"
-          mv Rare-${{ inputs.version }}.zip Rare-${{ inputs.version }}-windows.zip
+          mv Rare-${{ inputs.version }}.zip Rare-${{ inputs.version }}-${{ matrix.arch }}-windows.zip
 
       - name: Upload artifact
         uses: actions/upload-artifact@v5
         with:
-          name: Rare-${{ inputs.version }}-windows.zip
-          path: Rare-${{ inputs.version }}-windows.zip
+          name: Rare-${{ inputs.version }}-${{ matrix.arch }}-windows.zip
+          path: Rare-${{ inputs.version }}-${{ matrix.arch }}-windows.zip
diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
index 47d8c81a2..e90208452 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -65,7 +65,8 @@ jobs:
     uses: ./.github/workflows/_job_publish.yml
     with:
       version: ${{ inputs.prerelease && needs.version.outputs.version || github.ref_name }}
-      file1: Rare-${{ needs.version.outputs.version }}-linux.zip
+      file1: Rare-${{ needs.version.outputs.version }}-x86_64-linux.zip
+      file2: Rare-${{ needs.version.outputs.version }}-arm64-linux.zip
 
   nuitka-macos:
     if: ${{ true }}
@@ -98,7 +99,8 @@ jobs:
     uses: ./.github/workflows/_job_publish.yml
     with:
       version: ${{ inputs.prerelease && needs.version.outputs.version || github.ref_name }}
-      file1: Rare-${{ needs.version.outputs.version }}-windows.zip
+      file1: Rare-${{ needs.version.outputs.version }}-x86_64-windows.zip
+      file2: Rare-${{ needs.version.outputs.version }}-arm64-windows.zip
 
   cx-freeze-appimage:
     if: ${{ true }}
@@ -150,4 +152,5 @@ jobs:
     uses: ./.github/workflows/_job_publish.yml
     with:
       version: ${{ inputs.prerelease && needs.version.outputs.version || github.ref_name }}
-      file1: Rare-${{ needs.version.outputs.version }}.msi
+      file1: Rare-${{ needs.version.outputs.version }}-x86_64.msi
+      file2: Rare-${{ needs.version.outputs.version }}-arm64.msi