diff --git a/new-cli/Directory.Packages.props b/new-cli/Directory.Packages.props
index aef8122b03..f6442ac986 100644
--- a/new-cli/Directory.Packages.props
+++ b/new-cli/Directory.Packages.props
@@ -20,7 +20,7 @@
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageVersion Include="Serilog.Sinks.Map" Version="2.0.0" />
-    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.25071.2" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.25072.1" />
     <PackageVersion Include="System.Text.Json" Version="9.0.1" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/new-cli/GitVersion.Cli.Generator/Content.cs b/new-cli/GitVersion.Cli.Generator/Content.cs
index f3a2484a68..edde296b9f 100644
--- a/new-cli/GitVersion.Cli.Generator/Content.cs
+++ b/new-cli/GitVersion.Cli.Generator/Content.cs
@@ -27,7 +27,7 @@ public static class Content
 
 namespace {{Namespace}};
 
-public class {{Model.CommandTypeName}}Impl : CliCommand, ICommandImpl
+public class {{Model.CommandTypeName}}Impl : Command, ICommandImpl
 {
     public string CommandName => nameof({{Model.CommandTypeName}}Impl);
     {{- if (Model.ParentCommand | string.empty) }}
@@ -38,14 +38,14 @@ public class {{Model.CommandTypeName}}Impl : CliCommand, ICommandImpl
     {{- $settingsProperties = Model.SettingsProperties | array.sort "Name" }}
     // Options list
     {{~ for $prop in $settingsProperties ~}}
-    protected readonly CliOption<{{$prop.TypeName}}> {{$prop.Name}}Option;
+    protected readonly Option<{{$prop.TypeName}}> {{$prop.Name}}Option;
     {{~ end ~}}
 
     public {{Model.CommandTypeName}}Impl({{Model.CommandTypeName}} command)
         : base("{{Model.CommandName}}", "{{Model.CommandDescription}}")
     {
         {{~ for $prop in $settingsProperties ~}}
-        {{$prop.Name}}Option = new CliOption<{{$prop.TypeName}}>("{{$prop.OptionName}}", [{{$prop.Aliases}}])
+        {{$prop.Name}}Option = new Option<{{$prop.TypeName}}>("{{$prop.OptionName}}", [{{$prop.Aliases}}])
         {
             Required = {{$prop.Required}},
             Description = "{{$prop.Description}}",
@@ -80,7 +80,7 @@ Task<int> Run(ParseResult parseResult, CancellationToken cancellationToken)
 using {{InfraNamespaceName}};
 namespace {{Namespace}};
 
-public class RootCommandImpl : CliRootCommand
+public class RootCommandImpl : RootCommand
 {
     public RootCommandImpl(IEnumerable<ICommandImpl> commands)
     {
@@ -94,12 +94,12 @@ private void AddCommand(ICommandImpl command, IDictionary<string, ICommandImpl>
     {
         if (!string.IsNullOrWhiteSpace(command.ParentCommandName))
         {
-            var parent = map[command.ParentCommandName] as CliCommand;
-            parent?.Add((CliCommand)command);
+            var parent = map[command.ParentCommandName] as Command;
+            parent?.Add((Command)command);
         }
         else
         {
-            Add((CliCommand)command);
+            Add((Command)command);
         }
     }
 }
diff --git a/new-cli/GitVersion.Cli/GitVersionApp.cs b/new-cli/GitVersion.Cli/GitVersionApp.cs
index d873b38bcd..7c9d1854d1 100644
--- a/new-cli/GitVersion.Cli/GitVersionApp.cs
+++ b/new-cli/GitVersion.Cli/GitVersionApp.cs
@@ -13,7 +13,7 @@ internal class GitVersionApp(RootCommandImpl rootCommand)
 
     public Task<int> RunAsync(string[] args, CancellationToken cancellationToken)
     {
-        var cliConfiguration = new CliConfiguration(rootCommand);
+        var cliConfiguration = new CommandLineConfiguration(rootCommand);
         var parseResult = cliConfiguration.Parse(args);
 
         var logFile = parseResult.GetValue<FileInfo?>(GitVersionSettings.LogFileOption);