diff --git a/build.cake b/build.cake
index 8c6e315..c4362f6 100644
--- a/build.cake
+++ b/build.cake
@@ -1,5 +1,5 @@
 // Load the recipe
-#load nuget:?package=NUnit.Cake.Recipe&version=1.5.0-alpha.4
+#load nuget:?package=NUnit.Cake.Recipe&version=1.5.0
 // Comment out above line and uncomment below for local tests of recipe changes
 //#load ../NUnit.Cake.Recipe/recipe/*.cake
 
diff --git a/src/agent/nunit-agent-net80.csproj b/src/agent/nunit-agent-net80.csproj
index 788d71b..3ab6b1f 100644
--- a/src/agent/nunit-agent-net80.csproj
+++ b/src/agent/nunit-agent-net80.csproj
@@ -24,8 +24,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="NUnit.Agent.Core" Version="4.0.0-alpha.39" />
-        <PackageReference Include="NUnit.Engine.Api" Version="4.0.0-alpha.39" />
+        <PackageReference Include="NUnit.Agent.Core" Version="4.0.0-alpha.40" />
+        <PackageReference Include="NUnit.Engine.Api" Version="4.0.0-alpha.40" />
     </ItemGroup>
   
 </Project>
\ No newline at end of file
diff --git a/src/launcher/nunit-agent-launcher-net80.csproj b/src/launcher/nunit-agent-launcher-net80.csproj
index ef6a288..54ff966 100644
--- a/src/launcher/nunit-agent-launcher-net80.csproj
+++ b/src/launcher/nunit-agent-launcher-net80.csproj
@@ -12,7 +12,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="NUnit.Agent.Core" Version="4.0.0-alpha.39" />
+	  <PackageReference Include="NUnit.Agent.Core" Version="4.0.0-alpha.40" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/tests/Net80AgentLauncherTests.cs b/src/tests/Net80AgentLauncherTests.cs
index 96a270d..7951279 100644
--- a/src/tests/Net80AgentLauncherTests.cs
+++ b/src/tests/Net80AgentLauncherTests.cs
@@ -71,8 +71,8 @@ public void SetUp()
         [TestCaseSource(nameof(RUNTIMES))]
         public void CanCreateProcess(string runtime)
         {
-            _package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
-            _package.Settings[RUN_AS_X86] = false;
+            _package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
+            _package.AddSetting(SettingDefinitions.RunAsX86.WithValue(false));
 
             bool supported = SUPPORTED.Contains(runtime);
             Assert.That(_launcher.CanCreateAgent(_package), Is.EqualTo(supported));
@@ -81,8 +81,8 @@ public void CanCreateProcess(string runtime)
         [TestCaseSource(nameof(RUNTIMES))]
         public void CanCreateX86Process(string runtime)
         {
-            _package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
-            _package.Settings[RUN_AS_X86] = true;
+            _package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
+            _package.AddSetting(SettingDefinitions.RunAsX86.WithValue(true));
 
             bool supported = SUPPORTED.Contains(runtime);
             Assert.That(_launcher.CanCreateAgent(_package), Is.EqualTo(supported));
@@ -91,8 +91,8 @@ public void CanCreateX86Process(string runtime)
         [TestCaseSource(nameof(RUNTIMES))]
         public void CreateProcess(string runtime)
         {
-            _package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
-            _package.Settings[RUN_AS_X86] = false;
+            _package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
+            _package.AddSetting(SettingDefinitions.RunAsX86.WithValue(false));
 
             if (SUPPORTED.Contains(runtime))
             {
@@ -116,8 +116,8 @@ private void CheckAgentPath(Process process, bool x86)
         [TestCaseSource(nameof(RUNTIMES))]
         public void CreateX86Process(string runtime)
         {
-            _package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
-            _package.Settings[RUN_AS_X86] = true;
+            _package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
+            _package.AddSetting(SettingDefinitions.RunAsX86.WithValue(true));
 
             if (SUPPORTED.Contains(runtime))
             {
@@ -153,8 +153,8 @@ private void CheckStandardProcessSettings(Process process)
         public void DebugAgentSetting()
         {
             var runtime = SUPPORTED[0];
-            _package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
-            _package.Settings[DEBUG_AGENT] = true;
+            _package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
+            _package.AddSetting(SettingDefinitions.DebugAgent.WithValue(true));
             var agentProcess = _launcher.CreateAgent(AGENTID, AGENCY_URL, _package);
             Assert.That(agentProcess.StartInfo.Arguments, Does.Contain("--debug-agent"));
         }
@@ -163,8 +163,8 @@ public void DebugAgentSetting()
         public void TraceLevelSetting()
         {
             var runtime = SUPPORTED[0];
-            _package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
-            _package.Settings[TRACE_LEVEL] = "Debug";
+            _package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
+            _package.AddSetting(SettingDefinitions.InternalTraceLevel.WithValue("Debug"));
             var agentProcess = _launcher.CreateAgent(AGENTID, AGENCY_URL, _package);
             Assert.That(agentProcess.StartInfo.Arguments, Does.Contain("--trace=Debug"));
         }
@@ -173,18 +173,18 @@ public void TraceLevelSetting()
         public void WorkDirectorySetting()
         {
             var runtime = SUPPORTED[0];
-            _package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
-            _package.Settings[WORK_DIRECTORY] = "WORKDIRECTORY";
+            _package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
+            _package.AddSetting(SettingDefinitions.WorkDirectory.WithValue("WORKDIRECTORY"));
             var agentProcess = _launcher.CreateAgent(AGENTID, AGENCY_URL, _package);
             Assert.That(agentProcess.StartInfo.Arguments, Does.Contain("--work=WORKDIRECTORY"));
         }
-
+        
         [Test]
         public void LoadUserProfileSetting()
         {
             var runtime = SUPPORTED[0];
-            _package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
-            _package.Settings[LOAD_USER_PROFILE] = true;
+            _package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
+            _package.AddSetting(SettingDefinitions.LoadUserProfile.WithValue(true));
             var agentProcess = _launcher.CreateAgent(AGENTID, AGENCY_URL, _package);
             Assert.That(agentProcess.StartInfo.LoadUserProfile, Is.True);
         }
diff --git a/src/tests/nunit-agent-launcher-net80.tests.csproj b/src/tests/nunit-agent-launcher-net80.tests.csproj
index 1d2007e..30257c4 100644
--- a/src/tests/nunit-agent-launcher-net80.tests.csproj
+++ b/src/tests/nunit-agent-launcher-net80.tests.csproj
@@ -23,7 +23,7 @@
 	<ItemGroup>
 		<PackageReference Include="NUnit" Version="4.1.0" />
 		<PackageReference Include="NUnitLite" Version="4.1.0" />
-		<PackageReference Include="NUnit.Engine.Api" Version="4.0.0-alpha.39" />
+		<PackageReference Include="NUnit.Engine.Api" Version="4.0.0-alpha.40" />
 	</ItemGroup>
 
 	<ItemGroup>