diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 8504992cd..837226d2d 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -48,7 +48,7 @@ if(MSVC)
   )
 
   install(
-    FILES ${CMAKE_CURRENT_SOURCE_DIR}/icinga2-setup-agent/bin/${CMAKE_BUILD_TYPE}/Icinga2SetupAgent.exe
+    FILES ${CMAKE_CURRENT_SOURCE_DIR}/icinga2-setup-agent/bin/\${CMAKE_INSTALL_CONFIG_NAME}/Icinga2SetupAgent.exe
     DESTINATION ${CMAKE_INSTALL_SBINDIR}
   )
 endif()
\ No newline at end of file
diff --git a/tools/icinga2-setup-agent/Icinga2SetupAgent.csproj b/tools/icinga2-setup-agent/Icinga2SetupAgent.csproj
index 42a96d326..2a0feeca8 100644
--- a/tools/icinga2-setup-agent/Icinga2SetupAgent.csproj
+++ b/tools/icinga2-setup-agent/Icinga2SetupAgent.csproj
@@ -31,6 +31,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\RelWithDebInfo\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MinSizeRel|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\RelWithDebInfo\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>icinga.ico</ApplicationIcon>
   </PropertyGroup>