diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml
index ce17b502..8f14a53f 100644
--- a/.github/workflows/cmake-build.yml
+++ b/.github/workflows/cmake-build.yml
@@ -48,7 +48,7 @@ jobs:
       uses: maxim-lobanov/setup-xcode@v1
       with:
         xcode-version: '15.3'
-    - name: Configure CMake ${{ matrix.os }}
+    - name: Configure CMake ${{ matrix.os }}-${{ matrix.compilercxx }}
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
       env: 
@@ -57,7 +57,7 @@ jobs:
       run: |
         cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPSAPI_BUILD_DOCS=OFF -DPSAPI_BUILD_BENCHMARKS=OFF -DPSAPI_BUILD_TESTS=OFF -DPSAPI_BUILD_PYTHON=OFF
 
-    - name: Build ${{ matrix.os }}
+    - name: Build ${{ matrix.os }}-${{ matrix.compilercxx }}
       # Build your program with the given configuration
       env:
         CC: ${{ matrix.compiler }}
@@ -72,11 +72,11 @@ jobs:
       with:
         python-version: '3.10'
     
-    - name: Generate artifacts for ${{ matrix.os }}
+    - name: Generate artifacts for ${{ matrix.os }}-${{ matrix.compilercxx }}
       run: python scripts/generate_release.py --build-dir ${{github.workspace}}/build
 
     - name: Upload Release Artifacts
       uses: actions/upload-artifact@v3
       with:
-        name: PhotoshopAPI-${{ matrix.os }}
+        name: PhotoshopAPI-${{ matrix.os }}-${{ matrix.compilercxx }}
         path: ${{github.workspace}}/release
\ No newline at end of file
diff --git a/.github/workflows/cmake-test.yml b/.github/workflows/cmake-test.yml
index 3472629f..2d9df6cb 100644
--- a/.github/workflows/cmake-test.yml
+++ b/.github/workflows/cmake-test.yml
@@ -49,19 +49,25 @@ jobs:
       with:
         xcode-version: '15.3'
 
-    - name: Configure CMake ${{ matrix.os }}
+    - name: Configure CMake ${{ matrix.os }}-${{ matrix.compilercxx }}
       env:
         CC: ${{ matrix.compiler }}
         CXX: ${{ matrix.compilercxx }}
       run: |
         cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPSAPI_BUILD_DOCS=OFF -DPSAPI_BUILD_BENCHMARKS=OFF -DPSAPI_BUILD_EXAMPLES=OFF -DPSAPI_BUILD_PYTHON=OFF
 
-    - name: Build ${{ matrix.os }}
+    - name: Build ${{ matrix.os }}-${{ matrix.compilercxx }}
       env:
         CC: ${{ matrix.compiler }}
         CXX: ${{ matrix.compilercxx }}
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+      
+    - name: List working dir on Windows
+      working-directory: ${{github.workspace}}/build/PhotoshopTest
+      if: runner.os == 'Windows'
+      run: dir
+        
 
-    - name: Test ${{ matrix.os }}
+    - name: Test ${{ matrix.os }}-${{ matrix.compilercxx }}
       working-directory: ${{github.workspace}}/build/PhotoshopTest
       run: ctest -C ${{env.BUILD_TYPE}} --extra-verbose --stop-on-failure
\ No newline at end of file