diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8162008..d452994 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,9 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       IGNORE_NORMALISATION_GIT_HEAD_MOVE: 1
-      # v5.10.0 of GitVersion has a fix for incorrect versions when building on tag. See https://github.com/GitTools/GitVersion/issues/2838
-      # It appears that the fix then had a regression in a later version, so pinning to v5.10.0.  See https://github.com/GitTools/GitVersion/issues/3351#issuecomment-1403657689
-      GITVERSION: '5.10.0'
+      GITVERSION: '6.0.x'
     outputs:
       version: ${{ steps.gitversion.outputs.fullSemVer }}
       package-version: ${{ steps.gitversion.outputs.fullSemVer }}
@@ -37,12 +35,12 @@ jobs:
           fetch-tags: true
 
       - name: Install GitVersion ${{ env.GITVERSION }}
-        uses: gittools/actions/gitversion/setup@v0.11.0
+        uses: gittools/actions/gitversion/setup@v3.1.1
         with:
           versionSpec: ${{ env.GITVERSION }}
 
       - name: Determine version
-        uses: gittools/actions/gitversion/execute@v0.11.0
+        uses: gittools/actions/gitversion/execute@v3.1.1
         id: gitversion
         with:
           useConfigFile: true
diff --git a/GitVersion.yml b/GitVersion.yml
index 64a722d..c8bb97f 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,21 +1,12 @@
 assembly-versioning-scheme: MajorMinorPatch
 mode: ContinuousDelivery
-continuous-delivery-fallback-tag: 'ci'
-# If your package version contains one of the following, they will not be visible from the older clients
-# (NuGet clients before 4.3.0 or Visual Studio before 2017 version 15.3):
-# The pre-release label is dot-separated, e.g. 1.0.0-alpha.1
-# The version has build-metadata, e.g. 1.0.0+githash We recommend you consider this to be a beta-feature until a significant majority of our users are on these latest clients that understand Semantic Versioning 2.0.0.
-# See https://devblogs.microsoft.com/nuget/whats-nu-in-nuget-with-visual-studio-2017-version-15-3/#support-for-semantic-versioning-200
-legacy-semver-padding: 1
-build-metadata-padding: 1
-commits-since-version-source-padding: 1
 branches:
   main:
     regex: ^main$
-    tag: 'ci'
+    label: 'ci'
   pull-request:
     regex: ^(pull|pull\-requests|pr)[/-]
     mode: ContinuousDelivery
-    tag: pr
+    label: pr
 ignore:
   sha: []