diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index d1dd9d22..5ee77638 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -26,18 +26,31 @@ jobs:
     - name: build Release
       run: msbuild ccextractor.sln /p:Configuration=Release
       working-directory: ./windows
+    - name: Prepare artifacts
+      run: mkdir ./windows/artifacts
+    - name: Copy release artifact
+      run: cp ./windows/Release/ccextractorwin.exe ./windows/artifacts/; cp ./windows/Release/ccextractorgui.exe ./windows/artifacts/
+    - uses: actions/upload-artifact@v1
+      with:
+        name: CCExtractor Windows Non-OCR Release build
+        path: ./windows/artifacts
+  build_non_ocr_debug:
+    runs-on: windows-latest
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v1
+    - name: Setup MSBuild.exe
+      uses: warrenbuckley/Setup-MSBuild@v1
     - name: build Debug
       run: msbuild ccextractor.sln /p:Configuration=Debug
       working-directory: ./windows
     - name: Prepare artifacts
       run: mkdir ./windows/artifacts
-    - name: Copy release artifact
-      run: cp ./windows/Release/ccextractorwin.exe ./windows/artifacts/; cp ./windows/Release/ccextractorgui.exe ./windows/artifacts/
-    - name: Copy debug artifact
-      run: cp ./windows/Debug/ccextractorwin.exe ./windows/artifacts/ccextractorwin_debug.exe; cp ./windows/Debug/ccextractorgui.exe ./windows/artifacts/ccextractorgui_debug.exe
+    - name: Copy debug artifacts
+      run: cp ./windows/Debug/ccextractorwin.exe ./windows/artifacts/; cp ./windows/Debug/ccextractorwin.pdb ./windows/artifacts/; cp ./windows/Debug/ccextractorgui.exe ./windows/artifacts/
     - uses: actions/upload-artifact@v1
       with:
-        name: CCExtractor Windows Release_or_Debug build
+        name: CCExtractor Windows Non-OCR Debug build
         path: ./windows/artifacts
   build_ocr_hardsubx_release:
     runs-on: windows-latest
@@ -49,16 +62,29 @@ jobs:
     - name: build Release
       run: msbuild ccextractor.sln /p:Configuration=Release-Full
       working-directory: ./windows
+    - name: Prepare artifacts
+      run: mkdir ./windows/artifacts
+    - name: Copy release artifact
+      run: cp ./windows/Release-Full/ccextractorwinfull.exe ./windows/artifacts/; cp ./windows/Release/ccextractorgui.exe ./windows/artifacts/
+    - uses: actions/upload-artifact@v1
+      with:
+        name: CCExtractor Windows OCR and HardSubX Release build
+        path: ./windows/artifacts
+  build_ocr_hardsubx_debug:
+    runs-on: windows-latest
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v1
+    - name: Setup MSBuild.exe
+      uses: warrenbuckley/Setup-MSBuild@v1
     - name: build Debug
       run: msbuild ccextractor.sln /p:Configuration=Debug-Full
       working-directory: ./windows
     - name: Prepare artifacts
       run: mkdir ./windows/artifacts
-    - name: Copy release artifact
-      run: cp ./windows/Release-Full/ccextractorwin.exe ./windows/artifacts/; cp ./windows/Release-Full/ccextractorgui.exe ./windows/artifacts/
     - name: Copy debug artifact
-      run: cp ./windows/Debug-Full/ccextractorwin.exe ./windows/artifacts/ccextractorwin_debug.exe; cp ./windows/Debug-Full/ccextractorgui.exe ./windows/artifacts/ccextractorgui_debug.exe
+      run: cp ./windows/Debug-Full/ccextractorwinfull.exe ./windows/artifacts/; cp ./windows/Debug-Full/ccextractorwinfull.pdb ./windows/artifacts/; cp ./windows/Debug/ccextractorgui.exe ./windows/artifacts/
     - uses: actions/upload-artifact@v1
       with:
-        name: CCExtractor OCR and HardSubX Windows Release_or_Debug build
+        name: CCExtractor Windows OCR and HardSubX Debug build
         path: ./windows/artifacts