diff --git a/artifacts.sh b/artifacts.sh
index e6106c4..5d756b2 100644
--- a/artifacts.sh
+++ b/artifacts.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
-mkdir -p publish publish/Shim publish/DesktopInstaller publish/DesktopInstallerLegacy
+mkdir -p publish publish/Shim publish/DesktopInstaller publish/DesktopInstallerLegacy publish/DesktopDebug
 version=$(cat jellyfin_mpv_shim/constants.py | grep '^CLIENT_VERSION' | cut -d '"' -f 2)
 if [[ "$1" == "standard" ]]
 then
     cp dist/jellyfin-mpv-desktop_version_installer.exe publish/DesktopInstaller/jellyfin-mpv-desktop_${version}_installer.exe || exit 1
     cp dist/run.exe publish/Shim/jellyfin-mpv-shim_${version}.exe || exit 1
+    mv dist/run-desktop publish/DesktopDebug/ || exit 1
 elif [[ "$1" == "legacy" ]]
 then
     cp dist/jellyfin-mpv-desktop_version_installer.exe publish/DesktopInstallerLegacy/jellyfin-mpv-desktop_${version}_LEGACY32_installer.exe || exit 1
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8571520..c413da3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -71,6 +71,8 @@ jobs:
     displayName: gen_pkg (Languages & Subrepos)
   - script: build-win.bat
     displayName: Main Build
+  - script: build-win-dbg.bat
+    displayName: Debug Build
   - bash: ./artifacts.sh standard
     displayName: Main Artifact Rename
 
@@ -78,6 +80,8 @@ jobs:
     artifact: ShimPortable
   - publish: publish/DesktopInstaller
     artifact: DesktopInstaller
+  - publish: publish/DesktopDebug
+    artifact: DesktopDebug
 
 - job: LegacyWindows
   pool:
diff --git a/build-win-dbg.bat b/build-win-dbg.bat
index 6f29e3c..aaa99da 100644
--- a/build-win-dbg.bat
+++ b/build-win-dbg.bat
@@ -1,5 +1,6 @@
 @echo off
-rd /s /q __pycache__ dist build
+rd /s /q __pycache__ build 
+rd /s /q dist\run-desktop
 set PATH=%PATH%;%CD%
 rem Edge-based build
 rem pyinstaller -c --add-binary "mpv-1.dll;." --add-data "jellyfin_mpv_shim\systray.png;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\display_mirror\index.html;jellyfin_mpv_shim\display_mirror" --add-data "jellyfin_mpv_shim\webclient_view\webclient;jellyfin_mpv_shim\webclient_view\webclient" --add-data "jellyfin_mpv_shim\display_mirror\jellyfin.css;jellyfin_mpv_shim\display_mirror" --add-binary "Microsoft.Toolkit.Forms.UI.Controls.WebView.dll;." --icon jellyfin.ico run-desktop-edge.py
@@ -8,6 +9,5 @@ pyinstaller -c --add-binary "mpv-1.dll;." --add-data "jellyfin_mpv_shim\mouse.lu
 xcopy /E /Y cef\cefpython3 dist\run-desktop\
 del dist\run-desktop\run-desktop.exe.manifest
 copy hidpi.manifest dist\run-desktop\run-desktop.exe.manifest
-rd /s /q __pycache__ build
-pyinstaller -cF --add-binary "mpv-1.dll;." --add-data "jellyfin_mpv_shim\mouse.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\systray.png;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\default_shader_pack;jellyfin_mpv_shim\default_shader_pack" --add-data "jellyfin_mpv_shim\messages;jellyfin_mpv_shim\messages" --add-data "jellyfin_mpv_shim\display_mirror\index.html;jellyfin_mpv_shim\display_mirror" --add-data "jellyfin_mpv_shim\display_mirror\jellyfin.css;jellyfin_mpv_shim\display_mirror" --add-binary "Microsoft.Toolkit.Forms.UI.Controls.WebView.dll;." --exclude-module cefpython3 --icon jellyfin.ico run.py
-pause
+rem rd /s /q __pycache__ build
+rem pyinstaller -cF --add-binary "mpv-1.dll;." --add-data "jellyfin_mpv_shim\mouse.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\systray.png;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\default_shader_pack;jellyfin_mpv_shim\default_shader_pack" --add-data "jellyfin_mpv_shim\messages;jellyfin_mpv_shim\messages" --add-data "jellyfin_mpv_shim\display_mirror\index.html;jellyfin_mpv_shim\display_mirror" --add-data "jellyfin_mpv_shim\display_mirror\jellyfin.css;jellyfin_mpv_shim\display_mirror" --add-binary "Microsoft.Toolkit.Forms.UI.Controls.WebView.dll;." --exclude-module cefpython3 --icon jellyfin.ico run.py