diff --git a/Tools/MonoGame.Content.Builder.Task/MonoGame.Content.Builder.Task.props b/Tools/MonoGame.Content.Builder.Task/MonoGame.Content.Builder.Task.props
index 0194a83dadd..0e704591de3 100644
--- a/Tools/MonoGame.Content.Builder.Task/MonoGame.Content.Builder.Task.props
+++ b/Tools/MonoGame.Content.Builder.Task/MonoGame.Content.Builder.Task.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <DotnetCommand Condition="'$(DotnetCommand)' == ''">dotnet</DotnetCommand>
     <EnableMGCBItems Condition="'$(EnableMGCBItems)' == ''">true</EnableMGCBItems>
-    <MGCBToolDirectory>$(MSBuildThisFileDirectory)tools</MGCBToolDirectory>
+    <MGCBToolDirectory>$(MSBuildThisFileDirectory)dotnet-tools</MGCBToolDirectory>
     <MGCBCommand Condition="'$(MGCBCommand)' == ''">mgcb</MGCBCommand>
   </PropertyGroup>
 
diff --git a/Tools/MonoGame.Content.Builder.Task/MonoGame.Content.Builder.Task.targets b/Tools/MonoGame.Content.Builder.Task/MonoGame.Content.Builder.Task.targets
index 577c7efbc4f..dff72b987f7 100644
--- a/Tools/MonoGame.Content.Builder.Task/MonoGame.Content.Builder.Task.targets
+++ b/Tools/MonoGame.Content.Builder.Task/MonoGame.Content.Builder.Task.targets
@@ -144,7 +144,7 @@
 
     <PropertyGroup>
       <_Command Condition="Exists ('$(MGCBToolDirectory)\$(MGCBCommand)')">&quot;$(MGCBToolDirectory)\$(MGCBCommand)&quot;</_Command>
-      <!-- Fallback to old behaviour this allows people to override $(MGCBCommand) -->
+      <!-- Fallback to old behaviour this allows people to override $(MGCBCommand) with the mgcb.dll -->
       <_Command Condition=" '$(_Command)' == '' ">&quot;$(DotnetCommand)&quot; &quot;$(MGCBCommand)&quot;</_Command>
     </PropertyGroup>
 
diff --git a/build/DeployTasks/UploadArtifactsTask.cs b/build/DeployTasks/UploadArtifactsTask.cs
index 128c0556cfe..2c72afe121b 100644
--- a/build/DeployTasks/UploadArtifactsTask.cs
+++ b/build/DeployTasks/UploadArtifactsTask.cs
@@ -20,7 +20,7 @@ public override async Task RunAsync(BuildContext context)
         // because the zip removes all the permissions.
         // Plus in windows hidden files (like the .store directory)
         // are ignored. This causes `dotnet tool` to error.
-        var path = System.IO.Path.Combine(context.BuildOutput, "Tests", "Tools", "Release", "tools");
+        var path = System.IO.Path.Combine(context.BuildOutput, "Tests", "Tools", "Release", "dotnet-tools");
         if (System.IO.Directory.Exists(path)) {
             context.Log.Information ($"Deleting: {path}");
             System.IO.Directory.Delete (path, recursive: true);