diff --git a/src/CommunityToolkit.Aspire.Hosting.Ngrok/NgrokExtensions.cs b/src/CommunityToolkit.Aspire.Hosting.Ngrok/NgrokExtensions.cs
index da930a5b2..bcd922862 100644
--- a/src/CommunityToolkit.Aspire.Hosting.Ngrok/NgrokExtensions.cs
+++ b/src/CommunityToolkit.Aspire.Hosting.Ngrok/NgrokExtensions.cs
@@ -57,18 +57,24 @@ public static IResourceBuilder<NgrokResource> AddNgrok(
             .WithImage(NgrokContainerValues.Image, NgrokContainerValues.Tag)
             .WithImageRegistry(NgrokContainerValues.Registry)
             .WithBindMount(configurationFolder, "/var/tmp/ngrok")
-            .WithHttpEndpoint(targetPort: 4040, port: endpointPort, name: endpointName);
-        resourceBuilder.OnResourceEndpointsAllocated(async (resource, e, ct) =>
+            .WithHttpEndpoint(targetPort: 4040, port: endpointPort, name: endpointName)
+            .WithArgs(context =>
+            {
+                var hasEndpoints = context.Resource.Annotations
+                    .OfType<NgrokEndpointAnnotation>()
+                    .Any(annotation => annotation.Endpoints.Count > 0);
+                context.Args.Add("start");
+                context.Args.Add(hasEndpoints ? "--all" : "--none");
+                context.Args.Add("--config");
+                context.Args.Add($"/var/tmp/ngrok/{name}.yml");
+            });
+        resourceBuilder.OnBeforeResourceStarted(async (resource, e, ct) =>
         {
             var endpointTuples = resource.Annotations
                 .OfType<NgrokEndpointAnnotation>()
-                .SelectMany(annotation => annotation.Endpoints.Select(ngrokEndpoint => (endpointRefernce: annotation.Resource.GetEndpoint(ngrokEndpoint.EndpointName), ngrokEndpoint)))
+                .SelectMany(annotation => annotation.Endpoints.Select(ngrokEndpoint => (endpointReference: annotation.Resource.GetEndpoint(ngrokEndpoint.EndpointName), ngrokEndpoint)))
                 .ToList();
             await CreateNgrokConfigurationFileAsync(configurationFolder, name, endpointTuples, configurationVersion ?? 3);
-
-            resourceBuilder.WithArgs(
-                "start", endpointTuples.Count > 0 ? "--all" : "--none",
-                "--config", $"/var/tmp/ngrok/{name}.yml");
         });
         return resourceBuilder;
     }
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Ngrok.Tests/NgrokArgsTests.cs b/tests/CommunityToolkit.Aspire.Hosting.Ngrok.Tests/NgrokArgsTests.cs
new file mode 100644
index 000000000..4d230b9ee
--- /dev/null
+++ b/tests/CommunityToolkit.Aspire.Hosting.Ngrok.Tests/NgrokArgsTests.cs
@@ -0,0 +1,66 @@
+using Aspire.Hosting;
+
+namespace CommunityToolkit.Aspire.Hosting.Ngrok.Tests;
+
+public class NgrokArgsTests
+{
+    [Fact]
+    public async Task AddNgrokWithNoTunnelEndpointsPassesStartNoneAndConfigPath()
+    {
+        var builder = DistributedApplication.CreateBuilder();
+
+        builder.AddNgrok("ngrok");
+
+        using var app = builder.Build();
+
+        var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();
+        var resource = Assert.Single(appModel.Resources.OfType<NgrokResource>());
+
+        var argsAnnotation = Assert.Single(resource.Annotations.OfType<CommandLineArgsCallbackAnnotation>());
+        var context = new CommandLineArgsCallbackContext([], resource, CancellationToken.None);
+        await argsAnnotation.Callback(context);
+
+        Assert.Equal(["start", "--none", "--config", "/var/tmp/ngrok/ngrok.yml"], context.Args);
+    }
+
+    [Fact]
+    public async Task AddNgrokWithTunnelEndpointPassesStartAllAndConfigPath()
+    {
+        var builder = DistributedApplication.CreateBuilder();
+
+        var api = builder.AddProject<Projects.CommunityToolkit_Aspire_Hosting_Ngrok_ApiService>("api");
+
+        builder.AddNgrok("ngrok")
+            .WithTunnelEndpoint(api, "http");
+
+        using var app = builder.Build();
+
+        var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();
+        var resource = Assert.Single(appModel.Resources.OfType<NgrokResource>());
+
+        var argsAnnotation = Assert.Single(resource.Annotations.OfType<CommandLineArgsCallbackAnnotation>());
+        var context = new CommandLineArgsCallbackContext([], resource, CancellationToken.None);
+        await argsAnnotation.Callback(context);
+
+        Assert.Equal(["start", "--all", "--config", "/var/tmp/ngrok/ngrok.yml"], context.Args);
+    }
+
+    [Fact]
+    public async Task AddNgrokArgsUseResourceNameInConfigPath()
+    {
+        var builder = DistributedApplication.CreateBuilder();
+
+        builder.AddNgrok("my-tunnel");
+
+        using var app = builder.Build();
+
+        var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();
+        var resource = Assert.Single(appModel.Resources.OfType<NgrokResource>());
+
+        var argsAnnotation = Assert.Single(resource.Annotations.OfType<CommandLineArgsCallbackAnnotation>());
+        var context = new CommandLineArgsCallbackContext([], resource, CancellationToken.None);
+        await argsAnnotation.Callback(context);
+
+        Assert.Contains("/var/tmp/ngrok/my-tunnel.yml", context.Args);
+    }
+}