diff --git a/.github/scripts/build-windows.ps1 b/.github/scripts/build-windows.ps1
index 102c718..77268c7 100644
--- a/.github/scripts/build-windows.ps1
+++ b/.github/scripts/build-windows.ps1
@@ -67,7 +67,10 @@ function Initialize-VS {
     # https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line
     # https://docs.microsoft.com/en-us/cpp/porting/binary-compat-2015-2017
 
-    $VS_ROOT = "C:\Program Files (x86)\Microsoft Visual Studio"
+    $VS_ROOTS = @(
+        "C:\Program Files\Microsoft Visual Studio",
+        "C:\Program Files (x86)\Microsoft Visual Studio"
+    )
     $VS_VERSIONS = @("2017", "2019", "2022")
     $VS_EDITIONS = @("Enterprise", "Professional", "Community")
     $VS_INIT_CMD_SUFFIX = "Common7\Tools\vsdevcmd.bat"
@@ -76,12 +79,14 @@ function Initialize-VS {
     $VS_INIT_ARGS = "-arch=$VS_ARCH -no_logo"
 
     $found = $false
-    :outer foreach ($version in $VS_VERSIONS) {
-        foreach ($edition in $VS_EDITIONS) {
-            $VS_INIT_CMD = "$VS_ROOT\$version\$edition\$VS_INIT_CMD_SUFFIX"
-            if (Test-Path $VS_INIT_CMD) {
-                $found = $true
-                break outer
+    :outer foreach ($VS_ROOT in $VS_ROOTS) {
+        foreach ($version in $VS_VERSIONS) {
+            foreach ($edition in $VS_EDITIONS) {
+                $VS_INIT_CMD = "$VS_ROOT\$version\$edition\$VS_INIT_CMD_SUFFIX"
+                if (Test-Path $VS_INIT_CMD) {
+                    $found = $true
+                    break outer
+                }
             }
         }
     }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7d25ef4..5e6d664 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -161,27 +161,27 @@ jobs:
           python-version: '3.13'
           numpy-version: '2.1.*'
 
-        - os-image: windows-2019
+        - os-image: windows-2022
           os-name: windows
           python-arch: 'x86_64'
           python-version: '3.9'
           numpy-version: '2.0.*'
-        - os-image: windows-2019
+        - os-image: windows-2022
           os-name: windows
           python-arch: 'x86_64'
           python-version: '3.10'
           numpy-version: '2.0.*'
-        - os-image: windows-2019
+        - os-image: windows-2022
           os-name: windows
           python-arch: 'x86_64'
           python-version: '3.11'
           numpy-version: '2.0.*'
-        - os-image: windows-2019
+        - os-image: windows-2022
           os-name: windows
           python-arch: 'x86_64'
           python-version: '3.12'
           numpy-version: '2.0.*'
-        - os-image: windows-2019
+        - os-image: windows-2022
           os-name: windows
           python-arch: 'x86_64'
           python-version: '3.13'
@@ -391,32 +391,32 @@ jobs:
           python-version: '3.13'
           numpy-version: '2.1.*'
 
-        - os-image: windows-2019
+        - os-image: windows-2022
           os-name: windows
           python-arch: 'x86_64'
           python-version: '3.9'
           numpy-version: '2.0.*'
-        - os-image: windows-2019
+        - os-image: windows-2022
           os-name: windows
           python-arch: 'x86_64'
           python-version: '3.10'
           numpy-version: '2.0.*'
-        - os-image: windows-2019
+        - os-image: windows-2022
           os-name: windows
           python-arch: 'x86_64'
           python-version: '3.11'
           numpy-version: '2.0.*'
-        - os-image: windows-2019
+        - os-image: windows-2022
           os-name: windows
           python-arch: 'x86_64'
           python-version: '3.12'
           numpy-version: '2.0.*'
-        - os-image: windows-2019
+        - os-image: windows-2022
           os-name: windows
           python-arch: 'x86_64'
           python-version: '3.12'
           numpy-version: '1.26.4'
-        - os-image: windows-2019
+        - os-image: windows-2022
           os-name: windows
           python-arch: 'x86_64'
           python-version: '3.13'
diff --git a/external/LibRaw b/external/LibRaw
index 261c18c..9646d77 160000
--- a/external/LibRaw
+++ b/external/LibRaw
@@ -1 +1 @@
-Subproject commit 261c18ca0f1f9b83a53947b77751050d90d18e67
+Subproject commit 9646d776c7c61976080a8f2be67928df0750493e
diff --git a/rawpy/_version.py b/rawpy/_version.py
index 6fea77c..71290cd 100644
--- a/rawpy/_version.py
+++ b/rawpy/_version.py
@@ -1 +1 @@
-__version__ = "0.25.0"
+__version__ = "0.25.1"