diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
index deeb122..851dee5 100644
--- a/.github/workflows/cmake-multi-platform.yml
+++ b/.github/workflows/cmake-multi-platform.yml
@@ -22,26 +22,26 @@ jobs:
       #
       # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
       matrix:
-        os: [macos-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
         build_type: [Release]
         c_compiler: [gcc, cl]
         include:
-          - os: windows-latest
-            c_compiler: cl
-            cpp_compiler: cl
           - os: ubuntu-latest
             c_compiler: gcc
             cpp_compiler: g++
           - os: macos-latest
             c_compiler: gcc
             cpp_compiler: g++
-        exclude:
           - os: windows-latest
-            c_compiler: gcc
+            c_compiler: cl
+            cpp_compiler: cl
+        exclude:
           - os: ubuntu-latest
             c_compiler: cl
           - os: macos-latest
             c_compiler: cl
+          - os: windows-latest
+            c_compiler: gcc
 
     steps:
     - uses: actions/checkout@v4
@@ -91,15 +91,6 @@ jobs:
       # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
       run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} --target empi
 
-    - name: Prepare production artifacts (Windows)
-      if: runner.os == 'Windows'
-      run: |
-        mkdir ${{ steps.strings.outputs.empi }}
-        copy ${{ steps.strings.outputs.build-output-dir }}\${{ matrix.build_type }}\empi.exe ${{ steps.strings.outputs.empi }}
-        copy ${{ github.workspace }}\vcpkg\packages\fftw3_x64-windows-release\bin\fftw3.dll ${{ steps.strings.outputs.empi }}
-        copy LICENCE ${{ steps.strings.outputs.empi }}
-        copy README.md ${{ steps.strings.outputs.empi }}
-
     - name: Prepare production artifacts (Non-Windows)
       if: runner.os != 'Windows'
       run: |
@@ -109,6 +100,15 @@ jobs:
         cp README.md ${{ steps.strings.outputs.empi }}
         chmod +x ${{ steps.strings.outputs.empi }}/empi
 
+    - name: Prepare production artifacts (Windows)
+      if: runner.os == 'Windows'
+      run: |
+        mkdir ${{ steps.strings.outputs.empi }}
+        copy ${{ steps.strings.outputs.build-output-dir }}\${{ matrix.build_type }}\empi.exe ${{ steps.strings.outputs.empi }}
+        copy ${{ github.workspace }}\vcpkg\packages\fftw3_x64-windows-release\bin\fftw3.dll ${{ steps.strings.outputs.empi }}
+        copy LICENCE ${{ steps.strings.outputs.empi }}
+        copy README.md ${{ steps.strings.outputs.empi }}
+
     - name: Archive production artifacts
       uses: actions/upload-artifact@v4
       with: