diff --git a/schemas/6.0/GitVersion.configuration.json b/schemas/6.0/GitVersion.configuration.json
index 273bdbb8bd..c0ccdb4e88 100644
--- a/schemas/6.0/GitVersion.configuration.json
+++ b/schemas/6.0/GitVersion.configuration.json
@@ -129,6 +129,9 @@
     "prevent-increment-of-merged-branch-version": {
       "$ref": "#/$defs/nullableOfBoolean2"
     },
+    "prevent-increment-when-current-commit-tagged": {
+      "$ref": "#/$defs/nullableOfBoolean3"
+    },
     "regex": {
       "$ref": "#/$defs/string2"
     },
@@ -157,13 +160,13 @@
       ]
     },
     "track-merge-message": {
-      "$ref": "#/$defs/nullableOfBoolean3"
+      "$ref": "#/$defs/nullableOfBoolean4"
     },
     "track-merge-target": {
-      "$ref": "#/$defs/nullableOfBoolean4"
+      "$ref": "#/$defs/nullableOfBoolean5"
     },
     "tracks-release-branches": {
-      "$ref": "#/$defs/nullableOfBoolean5"
+      "$ref": "#/$defs/nullableOfBoolean6"
     },
     "update-build-number": {
       "description": "Whether to update the build number in the project file. Defaults to true.",
@@ -176,6 +179,22 @@
       "default": "(?<version>[vV]?\\d+(\\.\\d+)?(\\.\\d+)?).*",
       "type": "string"
     },
+    "strategies": {
+      "description": "Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfiguredNextVersion', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'TrunkBased'.",
+      "type": "array",
+      "items": {
+        "description": "Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfiguredNextVersion', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'TrunkBased'.",
+        "enum": [
+          "None",
+          "ConfiguredNextVersion",
+          "MergeMessage",
+          "TaggedCommit",
+          "TrackReleaseBranches",
+          "VersionInBranchName",
+          "TrunkBased"
+        ]
+      }
+    },
     "workflow": {
       "description": "The base template of the configuration to use. Possible values are: 'GitFlow/v1' or 'GitHubFlow/v1'",
       "type": "string"
@@ -215,6 +234,9 @@
         "prevent-increment-of-merged-branch-version": {
           "$ref": "#/$defs/nullableOfBoolean2"
         },
+        "prevent-increment-when-current-commit-tagged": {
+          "$ref": "#/$defs/nullableOfBoolean3"
+        },
         "regex": {
           "$ref": "#/$defs/string2"
         },
@@ -222,13 +244,13 @@
           "$ref": "#/$defs/hashSetOfString1"
         },
         "track-merge-message": {
-          "$ref": "#/$defs/nullableOfBoolean3"
+          "$ref": "#/$defs/nullableOfBoolean4"
         },
         "track-merge-target": {
-          "$ref": "#/$defs/nullableOfBoolean4"
+          "$ref": "#/$defs/nullableOfBoolean5"
         },
         "tracks-release-branches": {
-          "$ref": "#/$defs/nullableOfBoolean5"
+          "$ref": "#/$defs/nullableOfBoolean6"
         }
       }
     },
@@ -245,8 +267,7 @@
       "enum": [
         "ManualDeployment",
         "ContinuousDelivery",
-        "ContinuousDeployment",
-        "TrunkBased"
+        "ContinuousDeployment"
       ]
     },
     "incrementStrategy": {
@@ -305,6 +326,13 @@
         "null"
       ]
     },
+    "nullableOfBoolean3": {
+      "description": "This branch related property controls the behvior whether to use the tagged (value set to true) or the incremented (value set to false) semantic version. Defaults to true.",
+      "type": [
+        "boolean",
+        "null"
+      ]
+    },
     "string2": {
       "format": "regex",
       "description": "The regular expression pattern to use to match this branch.",
@@ -318,21 +346,21 @@
         "type": "string"
       }
     },
-    "nullableOfBoolean3": {
+    "nullableOfBoolean4": {
       "description": "This property is a branch related property and gives the user the possibility to control the behavior of whether the merge commit message will be interpreted as a next version or not.",
       "type": [
         "boolean",
         "null"
       ]
     },
-    "nullableOfBoolean4": {
+    "nullableOfBoolean5": {
       "description": "Strategy which will look for tagged merge commits directly off the current branch.",
       "type": [
         "boolean",
         "null"
       ]
     },
-    "nullableOfBoolean5": {
+    "nullableOfBoolean6": {
       "description": "Indicates this branch configuration represents develop in GitFlow.",
       "type": [
         "boolean",
diff --git a/src/.run/GitVersion.Schema.run.xml b/src/.run/GitVersion.Schema.run.xml
new file mode 100644
index 0000000000..0ecc7bc03c
--- /dev/null
+++ b/src/.run/GitVersion.Schema.run.xml
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="GitVersion.Schema" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Schema/bin/Debug/net8.0/schema.exe" />
+    <option name="PROGRAM_PARAMETERS" value="--OutputDirectory schemas --Version 6.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Schema/GitVersion.Schema.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value="net8.0" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file