diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index d568cd655..d26b799a9 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -45,7 +45,7 @@
       "rollForward": false
     },
     "gitversion.tool": {
-      "version": "5.12.0",
+      "version": "6.6.0",
       "commands": [
         "dotnet-gitversion"
       ],
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 06503b581..da595545d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <!-- Build Tools -->
   <ItemGroup>
-    <GlobalPackageReference Include="GitVersion.MsBuild" Version="5.10.3" />
+    <GlobalPackageReference Include="GitVersion.MsBuild" Version="6.6.0" />
   </ItemGroup>
   <!-- Framework-Agnostic Packages -->
   <ItemGroup>
diff --git a/GitVersion.yml b/GitVersion.yml
index 4c779767e..eb3931a64 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -4,50 +4,50 @@ branches:
   main:
     regex: ^master$|^main$
     mode: ContinuousDelivery
-    tag: ''
+    label: ''
     increment: Patch
-    prevent-increment-of-merged-branch-version: true
+    prevent-increment:
+      of-merged-branch: true
     track-merge-target: false
     source-branches: [ 'develop', 'release' ]
     tracks-release-branches: false
     is-release-branch: false
-    is-mainline: true
     pre-release-weight: 55000
   develop:
     regex: ^dev(elop)?(ment)?$
     mode: ContinuousDeployment
-    tag: alpha
+    label: alpha
     increment: Minor
-    prevent-increment-of-merged-branch-version: false
+    prevent-increment:
+      of-merged-branch: false
     track-merge-target: true
     source-branches: []
     tracks-release-branches: true
     is-release-branch: false
-    is-mainline: false
     pre-release-weight: 0
   release:
     regex: ^releases?[/-]
     mode: ContinuousDeployment
-    tag: preview
+    label: preview
     increment: None
-    prevent-increment-of-merged-branch-version: true
+    prevent-increment:
+      of-merged-branch: true
     track-merge-target: false
     source-branches: [ 'develop', 'main', 'support', 'release' ]
     tracks-release-branches: false
     is-release-branch: true
-    is-mainline: false
     pre-release-weight: 30000 
   support:
     regex: ^support[/-]
     mode: ContinuousDelivery
-    tag: ''
+    label: ''
     increment: Patch
-    prevent-increment-of-merged-branch-version: true
+    prevent-increment:
+      of-merged-branch: true
     track-merge-target: false
     source-branches: [ 'main' ]
     tracks-release-branches: false
     is-release-branch: false
-    is-mainline: true
     pre-release-weight: 55000
 ignore:
   sha: []
diff --git a/cake/Build.csproj b/cake/Build.csproj
index 74b41dbd8..c82d8e210 100644
--- a/cake/Build.csproj
+++ b/cake/Build.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>    
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
+	  <GitVersionOutputFile>$(MSBuildProjectDirectory)\obj\gitversion.json</GitVersionOutputFile>
 	  <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/utils/tests/AXOpen.Utils.Tests/axopen_utils_tests_L1.csproj b/src/utils/tests/AXOpen.Utils.Tests/axopen_utils_tests_L1.csproj
index f1a7f1aaf..4b3d028dc 100644
--- a/src/utils/tests/AXOpen.Utils.Tests/axopen_utils_tests_L1.csproj
+++ b/src/utils/tests/AXOpen.Utils.Tests/axopen_utils_tests_L1.csproj
@@ -27,9 +27,6 @@
 		</None>
 	</ItemGroup>
 
-	<ItemGroup>
-	  <PackageVersion Update="GitVersion.MsBuild" Version="6.0.5" />
-	</ItemGroup>
 
 	<ItemGroup>
 	  <PackageReference Update="GitVersion.MsBuild">