diff --git a/.github/actions/build-windows-qt/action.yml b/.github/actions/build-windows-qt/action.yml
index b97f8e037..2592e0e5d 100644
--- a/.github/actions/build-windows-qt/action.yml
+++ b/.github/actions/build-windows-qt/action.yml
@@ -51,7 +51,22 @@ runs:
       shell: pwsh
       run: ./Build-Dependencies.ps1 -Dependencies "Qt${{ inputs.qtVersion }}" -SkipBuild -SkipUnpack -Target ${{ inputs.target }} -Configuration ${{ inputs.config }} -Shared
 
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: '6.4.1'
+        host: 'windows'
+        target: 'desktop'
+        arch: 'win64_msvc2019_64'
+        modules: 'qtimageformats qtmultimedia qtshadertools'
+        archives: 'qtsvg qtbase'
+        cache: true
+
+    - name: Build and Install Windows Qt
+      if: ${{ steps.deps-cache.outputs.cache-hit != 'true' && inputs.qtVersion > '5'}}
+      shell: pwsh
+      run: ./Build-Dependencies.ps1 -Dependencies "Qt${{ inputs.qtVersion }}"  -Target ${{ inputs.target }} -Configuration ${{ inputs.config }} -Shared -QtHostPath $Env:Qt6_DIR
     - name: Build and Install Windows Qt
-      if: ${{ steps.deps-cache.outputs.cache-hit != 'true' }}
+      if: ${{ steps.deps-cache.outputs.cache-hit != 'true' && inputs.qtVersion == '5'}}
       shell: pwsh
       run: ./Build-Dependencies.ps1 -Dependencies "Qt${{ inputs.qtVersion }}"  -Target ${{ inputs.target }} -Configuration ${{ inputs.config }} -Shared
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0dbf3e285..742e23c83 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        target: [macos-arm64, macos-x86_64, linux-x86_64, windows-x64, windows-x86]
+        target: [macos-arm64, macos-x86_64, linux-x86_64, windows-x64, windows-x86, windows-arm64]
         include:
           - target: macos-arm64
             os: 'macos-12'
@@ -46,6 +46,11 @@ jobs:
             config: 'Release'
             type: 'static'
             revision: 8
+          - target: windows-arm64
+            os: 'ubuntu-20.04'
+            config: 'Release'
+            type: 'static'
+            revision: 8
     env:
       CACHE_REVISION: ${{ matrix.revision }}
     defaults:
@@ -455,7 +460,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        target: [x64, x86]
+        target: [x64, x86, arm64]
         include:
           - target: x64
             config: 'Release'
@@ -463,6 +468,9 @@ jobs:
           - target: x86
             config: 'Release'
             type: 'static'
+          - target: arm64
+            config: 'Release'
+            type: 'static'
     env:
       CACHE_REVISION: '3'
     defaults:
@@ -536,8 +544,11 @@ jobs:
       fail-fast: true
       matrix:
         qtVersion: [5, 6]
-        target: [x64, x86]
+        target: [x64, x86, arm64]
         config: ['RelWithDebInfo', 'Debug']
+        exclude: 
+          - qtVersion: 5
+            target: arm64
     env:
       CACHE_REVISION: '02'
     steps:
@@ -594,7 +605,10 @@ jobs:
       fail-fast: true
       matrix:
         qtVersion: [5, 6]
-        target: [x64, x86]
+        target: [x64, x86, arm64]
+        exclude: 
+          - qtVersion: 5
+            target: arm64
     needs: [windows-qt-build]
     steps:
       - name: Checkout