diff --git a/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Delays/DelaysCreateCommand.cs b/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Delays/DelaysCreateCommand.cs
index 64f65b4f3..b1133a6d8 100644
--- a/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Delays/DelaysCreateCommand.cs
+++ b/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Delays/DelaysCreateCommand.cs
@@ -15,7 +15,7 @@ public static Command CreateCommand()
             {
                 var brokerConnection = brokerConnectionBinder.CreateBrokerConnection(parseResult);
 
-                var delaysCreate = new DelaysCreateCommand(brokerConnection, parseResult.Configuration.Output);
+                var delaysCreate = new DelaysCreateCommand(brokerConnection, parseResult.InvocationConfiguration.Output);
                 await delaysCreate.Run(cancellationToken);
             });
 
diff --git a/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Delays/DelaysMigrateCommand.cs b/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Delays/DelaysMigrateCommand.cs
index 757ba4ae1..779204f9b 100644
--- a/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Delays/DelaysMigrateCommand.cs
+++ b/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Delays/DelaysMigrateCommand.cs
@@ -35,7 +35,7 @@ public static Command CreateCommand()
                     _ => throw new InvalidOperationException()
                 };
 
-                var delaysMigrate = new DelaysMigrateCommand(brokerConnection, routingTopology, parseResult.Configuration.Output);
+                var delaysMigrate = new DelaysMigrateCommand(brokerConnection, routingTopology, parseResult.InvocationConfiguration.Output);
                 await delaysMigrate.Run(cancellationToken);
             });
 
diff --git a/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Delays/DelaysVerifyCommand.cs b/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Delays/DelaysVerifyCommand.cs
index 4eee2d558..dbe8e6720 100644
--- a/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Delays/DelaysVerifyCommand.cs
+++ b/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Delays/DelaysVerifyCommand.cs
@@ -15,7 +15,7 @@ public static Command CreateCommand()
             {
                 var brokerVerifier = brokerVerifierBinder.CreateBrokerVerifier(parseResult);
 
-                var delaysVerify = new DelaysVerifyCommand(brokerVerifier, parseResult.Configuration.Output);
+                var delaysVerify = new DelaysVerifyCommand(brokerVerifier, parseResult.InvocationConfiguration.Output);
                 await delaysVerify.Run(cancellationToken);
             });
 
diff --git a/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Endpoint/EndpointCreateCommand.cs b/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Endpoint/EndpointCreateCommand.cs
index 020aa87fd..7da89d971 100644
--- a/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Endpoint/EndpointCreateCommand.cs
+++ b/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Endpoint/EndpointCreateCommand.cs
@@ -44,7 +44,7 @@ public static Command CreateCommand()
                 var brokerConnection = brokerConnectionBinder.CreateBrokerConnection(parseResult);
                 var routingTopology = routingTopologyBinder.CreateRoutingTopology(parseResult);
 
-                var queueCreate = new EndpointCreateCommand(brokerConnection, routingTopology, parseResult.Configuration.Output, parseResult.Configuration.Error);
+                var queueCreate = new EndpointCreateCommand(brokerConnection, routingTopology, parseResult.InvocationConfiguration.Output, parseResult.InvocationConfiguration.Error);
                 await queueCreate.Run(parseResult.GetRequiredValue(endpointNameArgument), parseResult.GetValue(errorQueueOption), parseResult.GetValue(auditQueueOption), parseResult.GetValue(instanceDiscriminatorsOption), cancellationToken);
             });
 
diff --git a/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Queue/QueueMigrateCommand.cs b/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Queue/QueueMigrateCommand.cs
index 4baadb1fa..b41f05091 100644
--- a/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Queue/QueueMigrateCommand.cs
+++ b/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Queue/QueueMigrateCommand.cs
@@ -25,7 +25,7 @@ public static Command CreateCommand()
             {
                 var brokerConnection = brokerConnectionBinder.CreateBrokerConnection(parseResult);
 
-                var migrateCommand = new QueueMigrateCommand(parseResult.GetRequiredValue(queueNameArgument), brokerConnection, parseResult.Configuration.Output);
+                var migrateCommand = new QueueMigrateCommand(parseResult.GetRequiredValue(queueNameArgument), brokerConnection, parseResult.InvocationConfiguration.Output);
                 await migrateCommand.Run(cancellationToken);
             });
 
diff --git a/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Queue/QueueValidateDeliveryLimitCommand.cs b/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Queue/QueueValidateDeliveryLimitCommand.cs
index bb9bcb46c..25b8b3cba 100644
--- a/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Queue/QueueValidateDeliveryLimitCommand.cs
+++ b/src/NServiceBus.Transport.RabbitMQ.CommandLine/Commands/Queue/QueueValidateDeliveryLimitCommand.cs
@@ -21,7 +21,7 @@ public static Command CreateCommand()
             {
                 var brokerVerifier = brokerVerifierBinder.CreateBrokerVerifier(parseResult);
 
-                var validateCommand = new QueueValidateDeliveryLimitCommand(parseResult.GetRequiredValue(queueNameArgument), brokerVerifier, parseResult.Configuration.Output);
+                var validateCommand = new QueueValidateDeliveryLimitCommand(parseResult.GetRequiredValue(queueNameArgument), brokerVerifier, parseResult.InvocationConfiguration.Output);
                 await validateCommand.Run(cancellationToken);
             });
 
diff --git a/src/NServiceBus.Transport.RabbitMQ.CommandLine/NServiceBus.Transport.RabbitMQ.CommandLine.csproj b/src/NServiceBus.Transport.RabbitMQ.CommandLine/NServiceBus.Transport.RabbitMQ.CommandLine.csproj
index 798d13c1a..cdce7b26e 100644
--- a/src/NServiceBus.Transport.RabbitMQ.CommandLine/NServiceBus.Transport.RabbitMQ.CommandLine.csproj
+++ b/src/NServiceBus.Transport.RabbitMQ.CommandLine/NServiceBus.Transport.RabbitMQ.CommandLine.csproj
@@ -19,7 +19,7 @@
   <ItemGroup>
     <PackageReference Include="NServiceBus" Version="10.0.0-alpha.3" />
     <PackageReference Include="RabbitMQ.Client" Version="7.1.2" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta6.25358.103" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta7.25380.108" />
   </ItemGroup>
 
   <ItemGroup>