diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 06b7a475..3429ce50 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -148,6 +148,13 @@ jobs:
         name: supercell-wx-${{ matrix.artifact_suffix }}
         path: ${{ github.workspace }}/supercell-wx/
 
+    - name: Upload Debug Artifacts (Windows)
+      if: matrix.os == 'windows-2022'
+      uses: actions/upload-artifact@v3
+      with:
+        name: supercell-wx-debug-${{ matrix.artifact_suffix }}
+        path: ${{ github.workspace }}/build/bin/*.pdb
+
     - name: Upload Artifacts (Linux)
       if: matrix.os == 'ubuntu-22.04'
       uses: actions/upload-artifact@v3
diff --git a/external/mapbox-gl-native.cmake b/external/mapbox-gl-native.cmake
index c48900c1..819dad6c 100644
--- a/external/mapbox-gl-native.cmake
+++ b/external/mapbox-gl-native.cmake
@@ -10,6 +10,15 @@ find_package(ZLIB)
 target_include_directories(mbgl-core PRIVATE ${ZLIB_INCLUDE_DIRS})
 target_link_libraries(mbgl-core INTERFACE ${ZLIB_LIBRARIES})
 
+if (MSVC)
+    # Produce PDB file for debug
+    target_compile_options(mbgl-core PRIVATE "$<$<CONFIG:Release>:/Zi>")
+    target_compile_options(qmaplibregl PRIVATE "$<$<CONFIG:Release>:/Zi>")
+    target_link_options(qmaplibregl PRIVATE "$<$<CONFIG:Release>:/DEBUG>")
+    target_link_options(qmaplibregl PRIVATE "$<$<CONFIG:Release>:/OPT:REF>")
+    target_link_options(qmaplibregl PRIVATE "$<$<CONFIG:Release>:/OPT:ICF>")
+endif()
+
 set(MBGL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/mapbox-gl-native/include
                      ${CMAKE_CURRENT_SOURCE_DIR}/mapbox-gl-native/platform/qt/include PARENT_SCOPE)
 
diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
index 1cee1716..5558b857 100644
--- a/scwx-qt/scwx-qt.cmake
+++ b/scwx-qt/scwx-qt.cmake
@@ -388,6 +388,15 @@ target_compile_options(supercell-wx PRIVATE
     $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
 )
 
+if (MSVC)
+    # Produce PDB file for debug
+    target_compile_options(scwx-qt PRIVATE "$<$<CONFIG:Release>:/Zi>")
+    target_compile_options(supercell-wx PRIVATE "$<$<CONFIG:Release>:/Zi>")
+    target_link_options(supercell-wx PRIVATE "$<$<CONFIG:Release>:/DEBUG>")
+    target_link_options(supercell-wx PRIVATE "$<$<CONFIG:Release>:/OPT:REF>")
+    target_link_options(supercell-wx PRIVATE "$<$<CONFIG:Release>:/OPT:ICF>")
+endif()
+
 target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
                                      Qt${QT_VERSION_MAJOR}::OpenGLWidgets
                                      Boost::json
diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
index d12b763a..e2ee86f9 100644
--- a/wxdata/wxdata.cmake
+++ b/wxdata/wxdata.cmake
@@ -233,6 +233,11 @@ target_compile_options(wxdata PRIVATE
     $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
 )
 
+if (MSVC)
+    # Produce PDB file for debug
+    target_compile_options(wxdata PRIVATE "$<$<CONFIG:Release>:/Zi>")
+endif()
+
 target_link_libraries(wxdata PUBLIC aws-cpp-sdk-core
                                     aws-cpp-sdk-s3
                                     cpr::cpr