diff --git a/.github/workflows/cmake-macos.yml b/.github/workflows/cmake-macos.yml
index 69d5ca0c..885ffd18 100644
--- a/.github/workflows/cmake-macos.yml
+++ b/.github/workflows/cmake-macos.yml
@@ -65,8 +65,9 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: 6.10.0
+          version: 6.10.1
           arch: clang_64
+          cache: true
 
       - name: Configure
         run: cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -B ${BUILD_DIR} -S .
@@ -85,5 +86,5 @@ jobs:
         with:
           name: web-eid-app-macos-build-${{github.run_number}}
           path: |
-            build/*/*/*.pkg
-            build/*/*/*.dmg
+            build/src/app/*.pkg
+            build/src/app/*.dmg
diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml
index 02579aae..806c4431 100644
--- a/.github/workflows/cmake-windows.yml
+++ b/.github/workflows/cmake-windows.yml
@@ -6,13 +6,12 @@ env:
   BUILD_TYPE: RelWithDebInfo
   BUILD_NUMBER: ${{github.run_number}}
   CMAKE_BUILD_PARALLEL_LEVEL: 4
-  VCPKG_INSTALLED_DIR: ${{ github.workspace }}/build/vcpkg_installed
   # Use libelectronic-id vcpkg manifest for dependencies
-  VCPKG_MANIFEST_DIR: ./lib/libelectronic-id/.github
+  VCPKG_MANIFEST_DIR: ./lib/libelectronic-id
 
 jobs:
   build:
-    runs-on: windows-2025
+    runs-on: ${{ matrix.arch == 'arm64' && 'windows-11-arm' || 'windows-2025' }}
     strategy:
       matrix:
         arch: [x64, arm64]
@@ -25,32 +24,29 @@ jobs:
           persist-credentials: false
 
       - name: Cache vcpkg
+        id: cache
         uses: actions/cache@v4
         with:
-          path: ${{ github.workspace }}/vcpkg_cache
+          path: |
+            ${{ github.workspace }}/vcpkg_cache
+            ~/.dotnet/tools
+            ~/.wix
           key: vcpkg-${{ matrix.arch }}-${{ hashFiles(format('{0}/vcpkg.json', env.VCPKG_MANIFEST_DIR)) }}
 
-      - name: Prepare vcpkg and libraries
-        uses: lukka/run-vcpkg@v11
-        with:
-          vcpkgJsonGlob: ${{ env.VCPKG_MANIFEST_DIR }}/vcpkg.json
-          runVcpkgInstall: true
-        env:
-          VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
-          VCPKG_DEFAULT_TRIPLET: ${{ matrix.arch }}-windows
-
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: 6.9.3
-          arch: ${{ matrix.arch == 'arm64' && 'win64_msvc2022_arm64_cross_compiled' || 'win64_msvc2022_64' }}
+          version: 6.10.1
+          arch: ${{ matrix.arch == 'arm64' && 'win64_msvc2022_arm64' || 'win64_msvc2022_64' }}
+          cache: true
 
       - name: Setup MS Visual C++ dev env
         uses: ilammy/msvc-dev-cmd@v1
         with:
-          arch: ${{ matrix.arch == 'arm64' && 'amd64_arm64' || 'amd64' }}
+          arch: ${{ matrix.arch }}
 
       - name: Install WiX
+        if: steps.cache.outputs.cache-hit != 'true'
         run: |
           dotnet tool install --global wix --version 6.0.2
           wix extension -g add WixToolset.UI.wixext/6.0.2
@@ -58,9 +54,11 @@ jobs:
           wix extension -g add WixToolset.BootstrapperApplications.wixext/6.0.2
 
       - name: Configure
+        env:
+          VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
         run: |
           cmake "-GNinja" -S . -B build `
-            "-DCMAKE_TOOLCHAIN_FILE=${env:RUNVCPKG_VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" `
+            "-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" `
             "-DCMAKE_BUILD_TYPE=${env:BUILD_TYPE}" `
             "-DVCPKG_MANIFEST_DIR=${{ env.VCPKG_MANIFEST_DIR }}"
 
@@ -81,4 +79,9 @@ jobs:
           path: |
             build/src/app/*.msi
             build/src/app/*.exe
-            build/**/*.pdb
+
+      - name: Upload debug artifacts
+        uses: actions/upload-artifact@v5
+        with:
+          name: web-eid-app-windows-debug-${{matrix.arch}}-${{github.run_number}}
+          path: build/**/*.pdb
\ No newline at end of file
diff --git a/README.md b/README.md
index c50f15fa..1eb04141 100644
--- a/README.md
+++ b/README.md
@@ -332,7 +332,7 @@ Use _Powershell_ to run the following commands to build the project.
           "-DCMAKE_PREFIX_PATH=${QT_ROOT}" `
           "-DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" `
           "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" `
-          "-DVCPKG_MANIFEST_DIR=lib/libelectronic-id/.github"
+          "-DVCPKG_MANIFEST_DIR=lib/libelectronic-id"
 
 - Run the build and installer build:
 
diff --git a/build.ps1 b/build.ps1
index 66a20f49..9b8315d1 100644
--- a/build.ps1
+++ b/build.ps1
@@ -6,5 +6,5 @@ param(
   [string]$arch = "x64"
 )
 
-& $cmake -S . -B build\windows -A $arch -DCMAKE_BUILD_TYPE=$buildtype "-DCMAKE_PREFIX_PATH=$qtdir" "-DCMAKE_TOOLCHAIN_FILE=$vcpkgroot\scripts\buildsystems\vcpkg.cmake" "-DVCPKG_MANIFEST_DIR=lib/libelectronic-id/.github"
+& $cmake -S . -B build\windows -A $arch -DCMAKE_BUILD_TYPE=$buildtype "-DCMAKE_PREFIX_PATH=$qtdir" "-DCMAKE_TOOLCHAIN_FILE=$vcpkgroot\scripts\buildsystems\vcpkg.cmake" "-DVCPKG_MANIFEST_DIR=lib/libelectronic-id"
 & $cmake --build build\windows --config $buildtype
diff --git a/lib/libelectronic-id b/lib/libelectronic-id
index e7490d08..f9126bc1 160000
--- a/lib/libelectronic-id
+++ b/lib/libelectronic-id
@@ -1 +1 @@
-Subproject commit e7490d08ad8ec62c447cafa79684bd6c033dfb97
+Subproject commit f9126bc1ed5aa137c3138d52700f39e044ef5dd4