diff --git a/.config/cspell.config.yaml b/.config/cspell.config.yaml
index 0cac82807d..edcdcc92ba 100644
--- a/.config/cspell.config.yaml
+++ b/.config/cspell.config.yaml
@@ -51,6 +51,7 @@ words:
   - Btrfs
   - canonicality
   - checkme
+  - choco
   - chrono
   - citardauq
   - clawback
diff --git a/.github/workflows/reusable-build-test-config.yml b/.github/workflows/reusable-build-test-config.yml
index fc80bbd216..ae91a8bf20 100644
--- a/.github/workflows/reusable-build-test-config.yml
+++ b/.github/workflows/reusable-build-test-config.yml
@@ -100,7 +100,7 @@ jobs:
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
       - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@65da1c59e81965eeb257caa3587b9d45066fb925
+        uses: XRPLF/actions/prepare-runner@121d1de2775d486d46140b9a91b32d5002c08153
         with:
           enable_ccache: ${{ inputs.ccache_enabled }}
 
diff --git a/cmake/Ccache.cmake b/cmake/Ccache.cmake
index 092212075c..aa8d3ac59d 100644
--- a/cmake/Ccache.cmake
+++ b/cmake/Ccache.cmake
@@ -46,6 +46,12 @@ set(CMAKE_VS_GLOBALS
         "TrackFileAccess=false"
         "UseMultiToolTask=true")
 
-# By default Visual Studio generators will use /Zi, which is not compatible with
-# ccache, so tell it to use /Z7 instead.
-set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>")
+# By default Visual Studio generators will use /Zi to capture debug information,
+# which is not compatible with ccache, so tell it to use /Z7 instead.
+if (MSVC)
+    foreach (var_
+        CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+        CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE)
+        string (REPLACE "/Zi" "/Z7" ${var_} "${${var_}}")
+    endforeach ()
+endif ()
diff --git a/cmake/XrplCompiler.cmake b/cmake/XrplCompiler.cmake
index 622b2d2f74..0777bf948c 100644
--- a/cmake/XrplCompiler.cmake
+++ b/cmake/XrplCompiler.cmake
@@ -44,6 +44,7 @@ if (MSVC)
     # omit debug info completely under CI (not needed)
     if (is_ci)
       string (REPLACE "/Zi" " " ${var_} "${${var_}}")
+      string (REPLACE "/Z7" " " ${var_} "${${var_}}")
     endif ()
   endforeach ()