diff --git a/.github/workflows/app-test-build-deploy.yaml b/.github/workflows/app-test-build-deploy.yaml
index da8ca5a6db9..20c065cddc7 100644
--- a/.github/workflows/app-test-build-deploy.yaml
+++ b/.github/workflows/app-test-build-deploy.yaml
@@ -234,7 +234,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['windows-2022', 'ubuntu-22.04', 'macos-latest']
+        os: ['windows-2022', 'ubuntu-22.04', 'macos-latest', 'ubuntu-24.04-arm']
         variant: ${{fromJSON(needs.determine-build-type.outputs.variants)}}
         target: ['desktop', 'odd']
         exclude:
@@ -242,6 +242,8 @@ jobs:
             target: 'odd'
           - os: 'macos-latest'
             target: 'odd'
+          - os: 'ubuntu-24.04-arm'
+            target: 'odd'
 
     runs-on: ${{ matrix.os }}
     name: 'Build ${{matrix.variant}} ${{matrix.target}} app on ${{matrix.os}}'
diff --git a/app-shell/Makefile b/app-shell/Makefile
index ec54213bf69..ad1b24783ad 100644
--- a/app-shell/Makefile
+++ b/app-shell/Makefile
@@ -116,10 +116,10 @@ deps:
 .PHONY: package-deps
 package-deps: clean lib deps
 
-package dist-posix dist-osx dist-linux dist-win: export NODE_ENV := production
-package dist-posix dist-osx dist-linux dist-win: export BUILD_ID := $(build_id)
-package dist-posix dist-osx dist-linux dist-win: export NO_PYTHON := $(if $(no_python_bundle),true,false)
-package dist-posix dist-osx dist-linux dist-win: export USE_HARD_LINKS := false
+package dist-posix dist-osx dist-linux dist-linux-arm64 dist-win: export NODE_ENV := production
+package dist-posix dist-osx dist-linux dist-linux-arm64 dist-win: export BUILD_ID := $(build_id)
+package dist-posix dist-osx dist-linux dist-linux-arm64 dist-win: export NO_PYTHON := $(if $(no_python_bundle),true,false)
+package dist-posix dist-osx dist-linux dist-linux-arm64 dist-win: export USE_HARD_LINKS := false
 
 # Note: these depend on make -C app dist having been run; do not do this automatically because we separate these
 # tasks in CI and even if you have a file dep it's easy to accidentally make the dist run.
@@ -142,6 +142,11 @@ dist-linux:  clean lib
 	$(builder) --linux
 	$(MAKE) _dist-collect-artifacts
 
+.PHONY: dist-linux-arm64
+dist-linux-arm64:  clean lib
+	$(builder) --linux --arm64
+	$(MAKE) _dist-collect-artifacts
+
 .PHONY: dist-win
 dist-win: clean lib
 	$(builder) --win --x64
@@ -160,6 +165,9 @@ dist-macos-latest: dist-osx
 .PHONY: dist-ubuntu-latest
 dist-ubuntu-latest: dist-linux
 
+.PHONY: dist-ubuntu-24.04-arm
+dist-ubuntu-24.04-arm: dist-linux-arm64
+
 .PHONY: dist-ubuntu-22.04
 dist-ubuntu-22.04: dist-linux