diff --git a/NuGet.Config b/NuGet.Config
index aac9575c70..e4e4038661 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
+    <clear />
     <add key="NuGet.org v3" value="https://api.nuget.org/v3/index.json" />
     <add key="feedz.io" value="https://f.feedz.io/octopus-deploy/dependencies/nuget/index.json" />
   </packageSources>
@@ -22,6 +23,7 @@
       <!-- Octopus.Versioning and Octopus.TinyTypes are a bit of a mess - some versions (used by other deps) are in feedz, some are in nuget. Messy. -->
       <package pattern="Octopus.Versioning" />
       <package pattern="Octopus.TinyTypes" />
+      <package pattern="Octopus.Nuke.*" />
     </packageSource>
     <packageSource key="NuGet.org v3">
       <package pattern="NuGet.Common" />
diff --git a/build/Build.cs b/build/Build.cs
index 83ac683419..7cda59f378 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -13,7 +13,7 @@ partial class Build : NukeBuild
 {
     [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")] readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
 
-    [Required] readonly Solution Solution = SolutionModelTasks.ParseSolution(KnownPaths.SourceDirectory / "Calamari.sln");
+    [Solution] readonly Solution Solution = null!;
 
     [Parameter] readonly DotNetVerbosity BuildVerbosity = DotNetVerbosity.minimal;
 
diff --git a/build/GlobalUsings.cs b/build/GlobalUsings.cs
index 595f5ca621..b6923270eb 100644
--- a/build/GlobalUsings.cs
+++ b/build/GlobalUsings.cs
@@ -4,6 +4,7 @@
 global using System.Threading.Tasks;
 global using Nuke.Common;
 global using Nuke.Common.IO;
+global using Nuke.Common.ProjectModel;
 global using Nuke.Common.Tools.DotNet;
 global using Nuke.Common.CI.TeamCity;
 global using Serilog;
diff --git a/build/NuGet.Config b/build/NuGet.Config
deleted file mode 100644
index 6c64cb618e..0000000000
--- a/build/NuGet.Config
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="NuGet.org v3" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-  <packageSourceMapping>
-    <packageSource key="NuGet.org v3">
-      <package pattern="NuGet.Common" />
-      <package pattern="NuGet.Configuration" />
-      <package pattern="NuGet.Frameworks" />
-      <package pattern="NuGet.Packaging" />
-      <package pattern="NuGet.Protocol" />
-      <package pattern="NuGet.Versioning" />
-      <package pattern="*" />
-    </packageSource>
-  </packageSourceMapping>
-</configuration>
diff --git a/build/_build.csproj b/build/_build.csproj
index 055e60b9fe..01902949d1 100644
--- a/build/_build.csproj
+++ b/build/_build.csproj
@@ -6,6 +6,7 @@
         <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
         <RootNamespace>Calamari.Build</RootNamespace>
         <NoWarn>CS0649;CS0169</NoWarn>
+        <DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
         <NukeRootDirectory>..</NukeRootDirectory>
         <NukeScriptDirectory>..</NukeScriptDirectory>
         <NukeTelemetryVersion>1</NukeTelemetryVersion>
@@ -28,7 +29,7 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Nuke.Common" Version="9.0.4" />
+        <PackageReference Include="Octopus.Nuke.Common" Version="10.1.14" />
         <PackageReference Include="Octopus.1Password.Sdk" Version="0.0.127" />
         <PackageReference Include="AzureSignTool" Version="6.0.1" ExcludeAssets="all" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
diff --git a/credits/credits.md b/credits/credits.md
index de4981be08..472438fe44 100644
--- a/credits/credits.md
+++ b/credits/credits.md
@@ -47,7 +47,7 @@ Calamari is made possible thanks to the following great third-party products.
 | NuGet.Commands                                    | Microsoft                                                                 | [https://aka.ms/nugetprj](https://aka.ms/nugetprj)                                                                                                                                                                          | [Apache-2.0](https://www.nuget.org/packages/NuGet.Commands/5.11.5/license)                                          |
 | NuGet.Core                                        | Outercurve Foundation                                                     | [https://github.com/NuGet/NuGet2](https://github.com/NuGet/NuGet2)                                                                                                                                                          | [Apache-2.0](https://raw.githubusercontent.com/NuGet/NuGet2/master/LICENSE.txt)                                     |
 | NuGet.Versioning                                  | Microsoft                                                                 | [https://aka.ms/nugetprj](https://aka.ms/nugetprj)                                                                                                                                                                          | [Apache-2.0](https://www.nuget.org/packages/NuGet.Versioning/5.11.6/license)                                        |
-| Nuke.Common                                       | Matthias Koch, Ulrich Buchgraber, Sebastian Karasek                       | [https://nuke.build/](https://nuke.build/)                                                                                                                                                                                  | [MIT](https://www.nuget.org/packages/Nuke.Common/7.0.6/license)                                                     |
+| Octopus.Nuke.Common                               | Fork of Nuke by Matthias Koch, Ulrich Buchgraber, Sebastian Karasek       | [https://nuke.build/](https://nuke.build/)                                                                                                                                                                                  | [MIT](https://www.nuget.org/packages/Nuke.Common/7.0.6/license)                                                     |
 | Octopus.CoreUtilities                             | Octopus Deploy                                                            | [https://github.com/OctopusDeploy/CoreUtilities](https://github.com/OctopusDeploy/CoreUtilities)                                                                                                                            | [Apache-2.0](https://licenses.nuget.org/Apache-2.0)                                                                 |
 | Octopus.Data                                      | Octopus Deploy                                                            | [https://github.com/OctopusDeploy/Data](https://github.com/OctopusDeploy/Data)                                                                                                                                              | [Apache-2.0](https://licenses.nuget.org/Apache-2.0)                                                                 |
 | Octopus.Octodiff                                  | Octopus Deploy                                                            | [https://github.com/OctopusDeploy/Octodiff](https://github.com/OctopusDeploy/Octodiff)                                                                                                                                      | [Apache-2.0](https://www.nuget.org/packages/Octopus.Octodiff/2.0.547/license)                                       |