diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 600bd5794..85a716002 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,22 +37,11 @@ jobs:
         working-directory: target
         run: ctest -V
   Windows-Build:
-    runs-on: ${{ matrix.images.name }}
+    runs-on: ${{ matrix.images }}
     strategy:
       matrix:
-        images:
-          # - name: windows-2019
-          #   vspath: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise'
-          #   arch: x86_amd64
-          # - name: windows-2019
-          #   vspath: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise'
-          #   arch: x86
-          - name: windows-2022
-            vspath: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise'
-            arch: x64
-          - name: windows-2022
-            vspath: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise'
-            arch: x86
+        arch: [x64, x86]
+        images: [windows-2019, windows-2022]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -66,8 +55,7 @@ jobs:
       - name: Setup MSVC
         uses: TheMrMilchmann/setup-msvc-dev@v3
         with:
-          arch: ${{ matrix.images.arch }}
-          vs-path: ${{ matrix.images.vspath }}
+          arch: ${{ matrix.arch }}
       - name: Pre build
         working-directory: target
         run: |
diff --git a/ext/ffi/CMakeLists.txt b/ext/ffi/CMakeLists.txt
index 01d4ea29d..ec1ae0fc2 100644
--- a/ext/ffi/CMakeLists.txt
+++ b/ext/ffi/CMakeLists.txt
@@ -49,7 +49,6 @@ ELSE()
   SET(HAVE_FFI_PREP_CIF_VAR TRUE)
   ADD_SUBDIRECTORY(libffi libffi)
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libffi/include)
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/libffi)
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/libffi/include)
   # since 3.0.13 it's doing proper __declspec for MCVC for DLL
   # and we want to make it static for bundled one so defaine FFI_BUILDING