diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
index f68a2d8..202d83c 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/dotnet-desktop.yml
@@ -13,8 +13,15 @@ jobs:
   build:
 
     strategy:
+      fail-fast: false
       matrix:
         configuration: [Debug, Release]
+        rid: [win-x64, win-arm64]
+        include:
+          - rid: win-x64
+            arch: x64
+          - rid: win-arm64
+            arch: arm64
 
     runs-on: windows-latest
 
@@ -40,28 +47,32 @@ jobs:
       uses: dotnet/nbgv@master
       id: nbgv
 
-    # Restore the application
+    # Restore the application for the target RID
     - name: Restore the application
-      run: dotnet restore
+      run: dotnet restore -r ${{ matrix.rid }}
       env:
         Configuration: ${{ matrix.configuration }}
 
-    # Build the application
+    # Build the application for the target RID (x64 + arm64)
     - name: Build the application
-      run: dotnet build --no-restore --property WarningLevel=0 FancyWM.GUI
-      env:
-        Configuration: ${{ matrix.configuration }}
+      run: dotnet build --no-restore --property WarningLevel=0 -c ${{ matrix.configuration }} -r ${{ matrix.rid }} FancyWM.GUI
 
-    # Execute all unit tests in the solution
+    # Execute unit tests once per configuration on the runner-native RID
     - name: Execute unit tests
+      if: matrix.rid == 'win-x64'
       run: |
-        dotnet test FancyWM.Tests
-        dotnet test FancyWM.Layouts.Tests
+        dotnet test FancyWM.Tests -c ${{ matrix.configuration }} --property WarningLevel=0
+        dotnet test FancyWM.Layouts.Tests -c ${{ matrix.configuration }} --property WarningLevel=0
 
     - name: Generate archive
+      shell: pwsh
       run: |
-        Compress-Archive -Path FancyWM.GUI/bin/${{ matrix.configuration }}/net10.0-windows10.0.18362.0/*.* -DestinationPath FancyWM.${{ matrix.configuration }}.x64.zip
-        (Get-FileHash FancyWM.${{ matrix.configuration }}.x64.zip -Algorithm SHA256).Hash | Out-File FancyWM.${{ matrix.configuration }}.x64.zip.sha256sum
+        $outDir = "FancyWM.GUI/bin/${{ matrix.configuration }}/net10.0-windows10.0.18362.0/${{ matrix.rid }}"
+        if (-not (Test-Path $outDir)) { throw "Missing output directory: $outDir" }
+        $zip = "FancyWM.${{ matrix.configuration }}.${{ matrix.arch }}.zip"
+        if (Test-Path $zip) { Remove-Item $zip -Force }
+        Compress-Archive -Path (Join-Path $outDir '*') -DestinationPath $zip
+        (Get-FileHash $zip -Algorithm SHA256).Hash | Out-File "$zip.sha256sum"
 
     - name: Release
       uses: softprops/action-gh-release@v1
@@ -69,5 +80,5 @@ jobs:
       with:
         prerelease: ${{ steps.nbgv.outputs.PublicRelease }}
         files: |
-          FancyWM.${{ matrix.configuration }}.x64.zip
-          FancyWM.${{ matrix.configuration }}.x64.zip.sha256sum
+          FancyWM.${{ matrix.configuration }}.${{ matrix.arch }}.zip
+          FancyWM.${{ matrix.configuration }}.${{ matrix.arch }}.zip.sha256sum
diff --git a/FancyWM.GUI/FancyWM.GUI.csproj b/FancyWM.GUI/FancyWM.GUI.csproj
index 44c68ab..3ef0e69 100644
--- a/FancyWM.GUI/FancyWM.GUI.csproj
+++ b/FancyWM.GUI/FancyWM.GUI.csproj
@@ -3,12 +3,12 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net10.0-windows10.0.18362.0</TargetFramework>
-    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>..\FancyWM\Icon4.ico</ApplicationIcon>
     <Authors>Vesko Karaganev</Authors>
     <PackageIcon>Icon.png</PackageIcon>
-    <Platforms>AnyCPU;x64;x86</Platforms>
+    <Platforms>AnyCPU;x64;x86;ARM64</Platforms>
     <StartupObject>FancyWM.GUI.Program</StartupObject>
     <Version>1.2.0</Version>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/FancyWM/FancyWM.csproj b/FancyWM/FancyWM.csproj
index 47a85e6..d0eb66f 100644
--- a/FancyWM/FancyWM.csproj
+++ b/FancyWM/FancyWM.csproj
@@ -3,12 +3,12 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net10.0-windows10.0.18362.0</TargetFramework>
-    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Icon4.ico</ApplicationIcon>
     <Authors>Vesko Karaganev</Authors>
     <PackageIcon>Icon.png</PackageIcon>
-    <Platforms>AnyCPU;x64;x86</Platforms>
+    <Platforms>AnyCPU;x64;x86;ARM64</Platforms>
     <StartupObject>FancyWM.Startup</StartupObject>
     <Version>1.2.0</Version>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -43,7 +43,12 @@
     <NoWarn>1701;1702;CA1416;CA2012;SYSLIB10;IDE0079</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoWarn>1701;1702;CA1416;CA2012;SYSLIB10;IDE0079</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>1701;1702;CA1416;CA2012;SYSLIB10;IDE0079</NoWarn>
   </PropertyGroup>