diff --git a/src/BuslyCLI.Console/BuslyCLI.Console.csproj b/src/BuslyCLI.Console/BuslyCLI.Console.csproj
index 744c0929..67b6e7de 100644
--- a/src/BuslyCLI.Console/BuslyCLI.Console.csproj
+++ b/src/BuslyCLI.Console/BuslyCLI.Console.csproj
@@ -31,7 +31,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.8" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.8" />
-    <PackageReference Include="NServiceBus" Version="10.1.4" />
+    <PackageReference Include="NServiceBus" Version="10.2.0" />
     <PackageReference Include="NServiceBus.AmazonSQS" Version="9.0.1" />
     <PackageReference Include="NServiceBus.RabbitMQ" Version="11.2.1" />
     <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="6.3.0" />
diff --git a/tests/BuslyCLI.Console.Tests/BuslyCLI.Console.Tests.csproj b/tests/BuslyCLI.Console.Tests/BuslyCLI.Console.Tests.csproj
index 368cf6fd..93101503 100644
--- a/tests/BuslyCLI.Console.Tests/BuslyCLI.Console.Tests.csproj
+++ b/tests/BuslyCLI.Console.Tests/BuslyCLI.Console.Tests.csproj
@@ -19,6 +19,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="NServiceBus.AmazonSQS" Version="9.0.1" />
+    <PackageReference Include="NServiceBus.Extensions.Hosting" Version="4.1.0" />
     <PackageReference Include="NServiceBus.Heartbeat" Version="6.0.1" />
     <PackageReference Include="NServiceBus.RabbitMQ" Version="11.2.1" />
     <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="6.3.0" />
diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/ServiceControl/IceBreaker.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/ServiceControl/IceBreaker.cs
index 4a39f7aa..72bfbcc7 100644
--- a/tests/BuslyCLI.Console.Tests/EndToEnd/ServiceControl/IceBreaker.cs
+++ b/tests/BuslyCLI.Console.Tests/EndToEnd/ServiceControl/IceBreaker.cs
@@ -4,6 +4,7 @@
 using BuslyCLI.Console.Tests.TestHelpers;
 using DotNet.Testcontainers.Builders;
 using DotNet.Testcontainers.Containers;
+using Microsoft.Extensions.Hosting;
 using Spectre.Console.Testing;
 using Testcontainers.RabbitMq;
 
@@ -23,6 +24,7 @@ public class IceBreakerTest : CommandTestBase
     protected IContainer servicePulse;
     protected IContainer serviceControlDb;
     protected RabbitMqContainer rabbitMq;
+    private IHost _endpoint;
 
     [OneTimeSetUp]
     public virtual async Task OneTimeSetUp()
@@ -185,19 +187,23 @@ public virtual async Task OneTimeSetUp()
         endpointConfiguration.SendFailedMessagesTo("error");
         endpointConfiguration.AuditProcessedMessagesTo("audit");
         endpointConfiguration.SendHeartbeatTo("Particular.ServiceControl", TimeSpan.FromSeconds(1));
-        var endpointInstance = await Endpoint.Start(endpointConfiguration);
+        var builder = Host.CreateApplicationBuilder();
+        builder.Services.AddNServiceBusEndpoint(endpointConfiguration);
+        _endpoint = builder.Build();
+        await _endpoint.StartAsync().WaitAsync(new TimeSpan(0, 0, 20));
     }
 
     [OneTimeTearDown]
     public virtual async Task OneTimeTearDown()
     {
+        await _endpoint.StopAsync().WaitAsync(new TimeSpan(0, 0, 20));
+        _endpoint.Dispose();
         await servicePulse.DisposeAsync();
         await serviceControlMonitoring.DisposeAsync();
         await serviceControl.DisposeAsync();
         await serviceControlAudit.DisposeAsync();
         await rabbitMq.DisposeAsync();
         await serviceControlDb.DisposeAsync();
-
     }
 
     [Test]
@@ -218,7 +224,7 @@ public void ShouldShowLicense()
 
         // Act
         var result = Sut.Run(
-            "sc",
+            "servicecontrol",
             "license",
             "show",
             "--config", configFile.FilePath);
@@ -230,7 +236,7 @@ public void ShouldShowLicense()
                 ┌────────┬───────────────┬──────────┬─────────┬──────────────────────┐
                 │ Status │ Registered To │ Is Trial │ Edition │ Expiration Date      │
                 ├────────┼───────────────┼──────────┼─────────┼──────────────────────┤
-                │ Valid  │ Blinds.com    │ No       │ Premium │ 2026-05-23 00:00:00Z │
+                │ Valid  │               │ YES      │ Premium │ 2026-06-23 00:00:00Z │
                 └────────┴───────────────┴──────────┴─────────┴──────────────────────┘
                 """.NormalizeLineEndings()));
     }
@@ -253,8 +259,8 @@ public void ShouldListEndpoints()
 
         // Act
         var result = Sut.Run(
-            "sc",
-            "endpoints",
+            "servicecontrol",
+            "endpoint",
             "list",
             "--config", configFile.FilePath);