diff --git a/ViGEmClient.sln b/ViGEmClient.sln
index 8e022b6..44670ff 100644
--- a/ViGEmClient.sln
+++ b/ViGEmClient.sln
@@ -36,13 +36,21 @@ Global
 		{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release_LIB|x86.ActiveCfg = Release_LIB|Win32
 		{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release_LIB|x86.Build.0 = Release_LIB|Win32
 		{A11CD588-F74A-41B5-9E5B-E60937052009}.Debug_DLL|x64.ActiveCfg = Debug|Any CPU
+		{A11CD588-F74A-41B5-9E5B-E60937052009}.Debug_DLL|x64.Build.0 = Debug|Any CPU
 		{A11CD588-F74A-41B5-9E5B-E60937052009}.Debug_DLL|x86.ActiveCfg = Debug|Any CPU
+		{A11CD588-F74A-41B5-9E5B-E60937052009}.Debug_DLL|x86.Build.0 = Debug|Any CPU
 		{A11CD588-F74A-41B5-9E5B-E60937052009}.Debug_LIB|x64.ActiveCfg = Debug|Any CPU
+		{A11CD588-F74A-41B5-9E5B-E60937052009}.Debug_LIB|x64.Build.0 = Debug|Any CPU
 		{A11CD588-F74A-41B5-9E5B-E60937052009}.Debug_LIB|x86.ActiveCfg = Debug|Any CPU
+		{A11CD588-F74A-41B5-9E5B-E60937052009}.Debug_LIB|x86.Build.0 = Debug|Any CPU
 		{A11CD588-F74A-41B5-9E5B-E60937052009}.Release_DLL|x64.ActiveCfg = Release|Any CPU
+		{A11CD588-F74A-41B5-9E5B-E60937052009}.Release_DLL|x64.Build.0 = Release|Any CPU
 		{A11CD588-F74A-41B5-9E5B-E60937052009}.Release_DLL|x86.ActiveCfg = Release|Any CPU
+		{A11CD588-F74A-41B5-9E5B-E60937052009}.Release_DLL|x86.Build.0 = Release|Any CPU
 		{A11CD588-F74A-41B5-9E5B-E60937052009}.Release_LIB|x64.ActiveCfg = Release|Any CPU
+		{A11CD588-F74A-41B5-9E5B-E60937052009}.Release_LIB|x64.Build.0 = Release|Any CPU
 		{A11CD588-F74A-41B5-9E5B-E60937052009}.Release_LIB|x86.ActiveCfg = Release|Any CPU
+		{A11CD588-F74A-41B5-9E5B-E60937052009}.Release_LIB|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/appveyor.yml b/appveyor.yml
index 2067927..5db981d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,8 +1,7 @@
 version: 1.16.{build}.0
 image: Visual Studio 2017
 build_script:
-- ps: .\build.ps1 -configuration Release_LIB
-- ps: .\build.ps1 -configuration Release_DLL
+- ps: .\build.ps1
 deploy:
 - provider: Environment
   name: BUILDBOT
diff --git a/build/Build.cs b/build/Build.cs
index 60d601f..c38d86e 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -12,22 +12,19 @@ using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.IO.PathConstruction;
 using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
 
-internal class Build : NukeBuild
+class Build : NukeBuild
 {
+    [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
+    private readonly string Configuration = IsLocalBuild ? "Debug" : "Release";
+
     [GitRepository] private readonly GitRepository GitRepository;
     [GitVersion] private readonly GitVersion GitVersion;
 
     [Solution("ViGEmClient.sln")] private readonly Solution Solution;
-
-    private AbsolutePath SourceDirectory => RootDirectory / "src";
     private AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts";
 
     private Target Clean => _ => _
-        .Executes(() =>
-        {
-            DeleteDirectories(GlobDirectories(SourceDirectory, "**/bin", "**/obj"));
-            EnsureCleanDirectory(ArtifactsDirectory);
-        });
+        .Executes(() => { EnsureCleanDirectory(ArtifactsDirectory); });
 
     private Target Restore => _ => _
         .DependsOn(Clean)
@@ -45,7 +42,7 @@ internal class Build : NukeBuild
             MSBuild(s => s
                 .SetTargetPath(Solution)
                 .SetTargets("Rebuild")
-                .SetConfiguration(Configuration)
+                .SetConfiguration($"{Configuration}_DLL")
                 .SetMaxCpuCount(Environment.ProcessorCount)
                 .SetNodeReuse(IsLocalBuild)
                 .SetTargetPlatform(MSBuildTargetPlatform.x64));
@@ -53,22 +50,22 @@ internal class Build : NukeBuild
             MSBuild(s => s
                 .SetTargetPath(Solution)
                 .SetTargets("Rebuild")
-                .SetConfiguration(Configuration)
+                .SetConfiguration($"{Configuration}_DLL")
                 .SetMaxCpuCount(Environment.ProcessorCount)
                 .SetNodeReuse(IsLocalBuild)
                 .SetTargetPlatform(MSBuildTargetPlatform.x86));
 
-            if (Configuration.Equals("release_dll", StringComparison.InvariantCultureIgnoreCase))
+            if (Configuration.Equals($"{Configuration}_dll", StringComparison.InvariantCultureIgnoreCase))
             {
                 var version =
                     new Version(IsLocalBuild ? GitVersion.GetNormalizedFileVersion() : AppVeyor.Instance.BuildVersion);
 
                 StampVersion(
-                    Path.Combine(RootDirectory, @"bin\release\x64\ViGEmClient.dll"),
+                    Path.Combine(RootDirectory, $@"bin\{Configuration}\x64\ViGEmClient.dll"),
                     version);
 
                 StampVersion(
-                    Path.Combine(RootDirectory, @"bin\release\x86\ViGEmClient.dll"),
+                    Path.Combine(RootDirectory, $@"bin\{Configuration}\x86\ViGEmClient.dll"),
                     version);
             }
         });
diff --git a/build/_build.csproj b/build/_build.csproj
index 75bc310..f285fb8 100644
--- a/build/_build.csproj
+++ b/build/_build.csproj
@@ -11,8 +11,8 @@
 
   <ItemGroup>
     <PackageReference Include="Nefarius.JsonConfig" Version="1.0.2" />
-    <PackageReference Include="Nuke.Common" Version="0.9.1" />
-    <PackageReference Include="GitVersion.CommandLine" Version="3.6.5" />
+    <PackageReference Include="Nuke.Common" Version="0.13.0" />
+    <PackageReference Include="GitVersion.CommandLine" Version="4.0.0" />
     <PackageReference Include="Vestris.ResourceLib" Version="2.0.0" />
   </ItemGroup>