diff --git a/.github/workflows/windows-msys2.yml b/.github/workflows/windows-msys2.yml
index 2df3ea772..80652be57 100644
--- a/.github/workflows/windows-msys2.yml
+++ b/.github/workflows/windows-msys2.yml
@@ -146,11 +146,13 @@ jobs:
           #find /c/Program\ Files\ \(x86\) -name "mt.exe"
           #win_sdk=$(reg query "HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots" | awk '{print $3}' | sort -r | head -n 1)
           reg query "HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots"
-          win_sdk=$(reg query "HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots" | awk '{print $3}' | sort -r)
+          win_sdk=$(reg query "HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots" | sort -r | head -n 1)
           echo "Windows SDK: $win_sdk"
           pwd
           # Add manifest which forces utf-8 encoding
           mt.exe -manifest ./ci/utf8-manifest "-outputresource:./build/src/tests/rnp_tests.exe;1"
+          mt.exe -manifest ./ci/utf8-manifest "-outputresource:./build/src/rnp/rnp.exe;1"
+          mt.exe -manifest ./ci/utf8-manifest "-outputresource:./build/src/rnpkeys/rnpkeys.exe;1"
           ctest --test-dir build -C Debug -V -R rnp_tests.test_windows_unicode || true
           ctest --parallel ${{ env.CORES }} --test-dir build -C Debug --output-on-failure -R rnp_tests.test_cli_rnpkeys_unicode