diff --git a/defaults.inc.bat b/defaults.inc.bat
index 392447fad..b228bc2ba 100644
--- a/defaults.inc.bat
+++ b/defaults.inc.bat
@@ -2,11 +2,6 @@ Rem ****************************************************************************
 rem 			"Build defaults - environment Variables"
 Rem ************************************************************************************************************************************************************************************
 
-rem Release or Debug
-set BUILD_TYPE=Release
-
-if "%~1" == "Debug" (set BUILD_TYPE=%~1)
-
 Rem ************************************************************************************************************************************************************************************
 rem 			"CUSTOMIZE HERE:"
 Rem ************************************************************************************************************************************************************************************
@@ -25,6 +20,8 @@ if "%APP_NAME_SANITIZED%" == ""             set APP_NAME_SANITIZED=Nextcloud
 
 if "%USE_BRANDING%" == ""                   set USE_BRANDING=0
 
+if "%BUILD_TYPE%" == ""                     set BUILD_TYPE=Release
+
 Rem ************************************************************************************************************************************************************************************
 Rem Build environment
 
diff --git a/single-build-installer-collect.bat b/single-build-installer-collect.bat
index 8f01438e9..92c034cd4 100644
--- a/single-build-installer-collect.bat
+++ b/single-build-installer-collect.bat
@@ -126,8 +126,12 @@ if exist "%MY_BUILD_PATH%/src/gui/%APP_NAME_SANITIZED%.ico" (
 )
 if %ERRORLEVEL% neq 0 goto onError
 
+if "%BUILD_TYPE%" == "RelWithDebInfo" (
+    set "PDB_OPTION=--pdb"
+)
+
 echo "* run windeployqt "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%.exe."
-start "run windeployqt" /D "%MY_COLLECT_PATH%/" /B /wait windeployqt --compiler-runtime --qmldir "%MY_REPO%\src" --release --force --verbose 2 "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%.exe" "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%_csync.dll" "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%cmd.exe" "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%sync.dll"
+start "run windeployqt" /D "%MY_COLLECT_PATH%/" /B /wait windeployqt %PDB_OPTION% --compiler-runtime --qmldir "%MY_REPO%\src" --pdb --release --force --verbose 2 "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%.exe" "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%_csync.dll" "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%cmd.exe" "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%sync.dll"
 if %ERRORLEVEL% neq 0 goto onError
 
 Rem Remove Qt bearer plugins, they seem to cause issues on Windows