diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3802e71240..59f5011350 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -8,7 +8,7 @@ on:
   release:
     types:
       - published
-jobs:
+    jobs:
   build:
     permissions:
       contents: write
@@ -16,9 +16,21 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-15-intel]
-        java: [ '21' ]
-        distribution: ['temurin']
+        include:
+          - os: windows-latest
+            java: '21'
+            distribution: 'temurin'
+          - os: ubuntu-latest
+            java: '21'
+            distribution: 'temurin'
+          - os: macos-15-intel
+            arch: intel
+            java: '21'
+            distribution: 'temurin'
+          - os: macos-15
+            arch: apple-silicon
+            java: '21'
+            distribution: 'temurin'
       fail-fast: false
     steps:
       #       ____          _  __     __   ___        ____                __
@@ -190,9 +202,9 @@ jobs:
       if: startsWith(matrix.os, 'macos')
       run: |
         mkdir releases/renamed/
-        cp releases/MapTool*.dmg releases/renamed/MapTool-${{ github.event.release.tag_name }}.dmg
-        cp releases/MapTool*.pkg releases/renamed/MapTool-${{ github.event.release.tag_name }}.pkg
-        cp releases/MapTool*-mac.app.zip releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac.app.zip
+        cp releases/MapTool*.dmg releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.dmg
+        cp releases/MapTool*.pkg releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.pkg
+        cp releases/MapTool*-mac.app.zip releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.app.zip
       continue-on-error: true
     - name: Upload Mac DMG Release Asset
       id: upload-release-asset-dmg
@@ -202,8 +214,8 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}.dmg
-        asset_name: MapTool-${{ github.event.release.tag_name }}.dmg
+        asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.dmg
+        asset_name: MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.dmg
         asset_content_type: application/octet-stream
     - name: Upload Mac PKG Release Asset
       id: upload-release-asset-pkg
@@ -213,8 +225,8 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}.pkg
-        asset_name: MapTool-${{ github.event.release.tag_name }}.pkg
+        asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.pkg
+        asset_name: MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.pkg
         asset_content_type: application/octet-stream
     - name: Upload Mac Image Release Asset
       id: upload-release-asset-mac-image
@@ -224,6 +236,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac.app.zip
-        asset_name: MapTool-${{ github.event.release.tag_name }}-mac.app.zip
+        asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.app.zip
+        asset_name: MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.app.zip
         asset_content_type: application/octet-stream
diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
index e558dab179..b91cb7ddfd 100644
--- a/.github/workflows/verify-build.yml
+++ b/.github/workflows/verify-build.yml
@@ -41,9 +41,19 @@ jobs:
     runs-on:  ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-15-intel]
-        java: [ '21' ]
-        distribution: [ 'temurin']
+        include:
+          - os: windows-latest
+            java: '21'
+            distribution: 'temurin'
+          - os: ubuntu-latest
+            java: '21'
+            distribution: 'temurin'
+          - os: macos-15-intel
+            java: '21'
+            distribution: 'temurin'
+          - os: macos-15
+            java: '21'
+            distribution: 'temurin'
       fail-fast: false
     steps:
       - name: Git checkout
diff --git a/build.gradle b/build.gradle
index 7adb8cc415..99dfe6531d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -294,7 +294,11 @@ runtime {
                     '--mac-package-name', project.name + developerRelease
             ]
             targetPlatform('mac') {
-                jdkHome = jdkDownload('https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_mac_hotspot_21.0.1_12.tar.gz')
+                if (osdetector.arch == 'aarch64') {
+                    jdkHome = jdkDownload('https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.1_12.tar.gz')
+                } else {
+                    jdkHome = jdkDownload('https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_mac_hotspot_21.0.1_12.tar.gz')
+                }
                 jvmArgs += [ '-Xdock:name=' + project.name + developerRelease ]
             }
         }
diff --git a/clientserver/build.gradle b/clientserver/build.gradle
index e182a5f815..e9aa6e1558 100644
--- a/clientserver/build.gradle
+++ b/clientserver/build.gradle
@@ -20,6 +20,8 @@ dependencies {
     implementation(libs.webrtc)
     if (osdetector.os.is('windows'))
         implementation(variantOf(libs.webrtc) { classifier('windows-x86_64')})
+    else if (osdetector.os.is('osx') && osdetector.arch == 'aarch64')
+        implementation(variantOf(libs.webrtc) { classifier('macos-aarch64')})
     else if (osdetector.os.is('osx'))
         implementation(variantOf(libs.webrtc) { classifier('macos-x86_64')})
     else if (osdetector.os.is('linux'))