diff --git a/build/Directory.Packages.props b/build/Directory.Packages.props
index 8cf5e174c4..a0fa0dcb3b 100644
--- a/build/Directory.Packages.props
+++ b/build/Directory.Packages.props
@@ -6,7 +6,7 @@
     <PackageVersion Include="Cake.Compression" Version="0.4.0" />
     <PackageVersion Include="Cake.Codecov" Version="6.0.0" />
     <PackageVersion Include="Cake.Coverlet" Version="6.0.1" />
-    <PackageVersion Include="Cake.Frosting" Version="6.0.0" />
+    <PackageVersion Include="Cake.Frosting" Version="6.1.0" />
     <PackageVersion Include="Cake.Frosting.Git" Version="5.0.1" />
     <PackageVersion Include="Cake.Http" Version="5.1.0" />
     <PackageVersion Include="Cake.Incubator" Version="10.0.0" />
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
index 6551b6475b..ad07a53be1 100644
--- a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
+++ b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
@@ -23,9 +23,6 @@ public override void Run(BuildContext context)
 
         var nugetSource = context.MakeAbsolute(Paths.Nuget).FullPath;
 
-        const int toolVersionValue = 11; // Workaround for now. It should be removed when https://github.com/cake-build/cake/issues/4658 is merged
-        var isMsBuildToolVersionValid = Enum.IsDefined(typeof(MSBuildToolVersion), toolVersionValue);
-
         context.Information("\nTesting msbuild task with dotnet build\n");
         foreach (var netVersion in Constants.DotnetVersions)
         {
@@ -46,15 +43,14 @@ public override void Run(BuildContext context)
             var exe = Paths.Integration.Combine("build").Combine(framework).CombineWithFilePath("app.dll");
             context.ValidateOutput("dotnet", exe.FullPath, fullSemVer);
 
-            if (!isMsBuildToolVersionValid) continue;
+            if (!Enum.IsDefined(MSBuildToolVersion.VS2026)) continue;
 
-            const MSBuildToolVersion toolVersion = (MSBuildToolVersion)toolVersionValue;
             context.Information("\nTesting msbuild task with msbuild (for full framework)\n");
 
             var msBuildSettings = new MSBuildSettings
             {
                 Verbosity = Verbosity.Minimal,
-                ToolVersion = toolVersion,
+                ToolVersion = MSBuildToolVersion.VS2026,
                 Restore = true
             };