diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index cc6428a865..b371771891 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -129,7 +129,6 @@ jobs:
         shell: bash
         run: >-
           dotnet build TUnit.CI.slnx -c Release
-          -p:DisableGitVersionTask=true
           "-p:Version=${{ steps.gitversion.outputs.semVer }}"
           "-p:AssemblyVersion=${{ steps.gitversion.outputs.assemblySemVer }}"
           "-p:FileVersion=${{ steps.gitversion.outputs.assemblySemFileVer }}"
@@ -143,7 +142,6 @@ jobs:
         run: >-
           dotnet publish TUnit.TestProject/TUnit.TestProject.csproj -c Release
           --use-current-runtime -p:Aot=true -o TESTPROJECT_AOT --framework net10.0
-          -p:DisableGitVersionTask=true
           "-p:Version=${{ steps.gitversion.outputs.semVer }}"
           "-p:AssemblyVersion=${{ steps.gitversion.outputs.assemblySemVer }}"
           "-p:FileVersion=${{ steps.gitversion.outputs.assemblySemFileVer }}"
diff --git a/Directory.Build.props b/Directory.Build.props
index c26c4804e8..90ef0b35f1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$(MSBuildProjectName) == 'TUnit.Pipeline'">
+  <PropertyGroup Condition="'$(MSBuildProjectName)' == 'TUnit.Pipeline'">
     <TargetFrameworks>net10.0</TargetFrameworks>
   </PropertyGroup>
 
@@ -14,7 +14,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- We only need GitVersion.MsBuild for version properties, not the generated class -->
+    <!-- Disable GitVersion MSBuild task by default - CI computes version once and passes properties explicitly.
+         This prevents GitVersion from spawning a process per project×TFM (153+ invocations). -->
+    <DisableGitVersionTask>true</DisableGitVersionTask>
     <GenerateGitVersionInformation>false</GenerateGitVersionInformation>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
diff --git a/TUnit.Templates/content/Directory.Build.props b/TUnit.Templates/content/Directory.Build.props
index 4f8ec58eec..3fead285f6 100644
--- a/TUnit.Templates/content/Directory.Build.props
+++ b/TUnit.Templates/content/Directory.Build.props
@@ -15,7 +15,7 @@
         <Using Include="TUnit.Assertions.Extensions" />
     </ItemGroup>
 
-    <ItemGroup Condition="$(MSBuildProjectName) == 'ExampleNamespace.TestProject' And $(MSBuildProjectDirectory.Contains('TUnit.Aspire.Starter'))">
+    <ItemGroup Condition="'$(MSBuildProjectName)' == 'ExampleNamespace.TestProject' And $(MSBuildProjectDirectory.Contains('TUnit.Aspire.Starter'))">
         <PackageReference Remove="TUnit.Aspire" />
         <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\TUnit.Aspire\TUnit.Aspire.csproj" />
         <Using Include="TUnit.Assertions" />
diff --git a/TestProject.props b/TestProject.props
index afb048f822..b9b42a2bc7 100644
--- a/TestProject.props
+++ b/TestProject.props
@@ -25,8 +25,8 @@
 
     </PropertyGroup>
 
-    <Target Name="CleanSourceGeneratedViewer" BeforeTargets="BeforeBuild">
-        <Message Text="Removing SourceGeneratedViewer directory..." Importance="high" />
+    <Target Name="CleanSourceGeneratedViewer" BeforeTargets="BeforeBuild"
+            Condition="'$(ContinuousIntegrationBuild)' != 'true' AND Exists('$(ProjectDir)SourceGeneratedViewer')">
         <ItemGroup>
             <FilesToDelete Include="$(ProjectDir)SourceGeneratedViewer\**\*" />
         </ItemGroup>