diff --git a/.github/workflows/windows_distribution_check.yml b/.github/workflows/windows_distribution_check.yml
index ef62098f..6a01d4af 100644
--- a/.github/workflows/windows_distribution_check.yml
+++ b/.github/workflows/windows_distribution_check.yml
@@ -12,11 +12,21 @@ jobs:
       matrix:
         build_type: [Release, Debug]
         shared_libraries: [ON, OFF]
-        platform: [ x64, Win32 ]
+        platform: [ x64, x86 ]
         
     steps:
       - uses: actions/checkout@v2
 
+      - name: Set up Visual Studio shell
+        uses: egor-tensin/vs-shell@v2
+        with:
+          arch: ${{matrix.platform}}
+
+      - name: Setup Ninja
+        uses: ashutoshvarma/setup-ninja@master
+        with:
+          version: 1.10.0
+
       - name: Set up Python
         uses: actions/setup-python@v1
         with:
@@ -29,7 +39,7 @@ jobs:
           conan profile update settings.build_type=${{matrix.build_type}} default
 
       - name: Conan Arch conditional config
-        if: ${{matrix.platform == 'Win32'}}
+        if: ${{matrix.platform == 'x86'}}
         run: |
           conan profile update settings.arch=x86 default
           conan profile update settings.arch_build=x86 default
@@ -44,13 +54,13 @@ jobs:
       - name: Build
         run: |
           cd build
-          cmake -G "Visual Studio 16 2019" -A ${{matrix.platform}} -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.shared_libraries}} -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_WIN_UNICODE=ON -DCMAKE_INSTALL_PREFIX=install ..
-          cmake --build . --config ${{matrix.build_type}}
+          cmake -GNinja -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.shared_libraries}} -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_WIN_UNICODE=ON -DCMAKE_INSTALL_PREFIX=install ..
+          ninja
 
       - name: Install
         run: |
           cd build
-          cmake --build . --config ${{matrix.build_type}} --target install
+          ninja install
           tree /f install
 
       - name: Test