diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
index b55699329f..d2e102099e 100644
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -22,9 +22,21 @@ env:
 jobs:
   build:
     name: Build On MacOS
-    runs-on: macos-latest
     timeout-minutes: 120
 
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - name: "Build on x64"
+            os: macos-latest-large
+            arch: x64
+          - name: "Build on Arm64"
+            os: macos-latest
+            arch: arm64
+
+    runs-on: ${{matrix.config.os}}
+
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE.
       - uses: actions/checkout@v2
@@ -90,7 +102,7 @@ jobs:
           cmake --build . --target pack
           ls -ls .
           ls -ls src
-          mv src/vnote.dmg VNote-${{env.VNOTE_VER}}-mac.dmg
+          mv src/vnote.dmg VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg
         working-directory: ${{runner.workspace}}/build
 
       # Enable tmate debugging of manually-triggered workflows if the input option was provided
@@ -101,8 +113,8 @@ jobs:
       - name: Archive Artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: VNote-${{env.VNOTE_VER}}-mac
-          path: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac.dmg
+          name: VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}
+          path: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg
 
       - name: Update Tag
         if: github.ref == 'refs/heads/master'
@@ -115,7 +127,7 @@ jobs:
         uses: johnwbyrd/update-release@v1.0.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          files: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac.dmg
+          files: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg
           release: Continuous Build
           tag: continuous-build
 
@@ -124,7 +136,7 @@ jobs:
         uses: ncipollo/release-action@v1.11.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac.dmg
+          artifacts: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg
           commit: master
           tag: v${{env.VNOTE_VER}}
           allowUpdates: true
diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml
index 33321eea75..1ef07933fc 100644
--- a/.github/workflows/ci-win.yml
+++ b/.github/workflows/ci-win.yml
@@ -28,14 +28,14 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - name: "Build On Win64 Qt 5.15"
+          - name: "Build on Win64 Qt 5.15"
             arch: win64_msvc2019_64
             qt: 5.15.2
             qt_modules: qtwebengine
             qt_tools: tools_opensslv3_x64
             qt_major: 5
             suffix: "-windows7"
-          - name: "Build On Win64 Qt 6.5"
+          - name: "Build on Win64 Qt 6.5"
             arch: win64_msvc2019_64
             qt: 6.5.3
             qt_modules: "qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat"