diff --git a/packages/cli/templates/csharp/echo/{{name}}.hbs/MainController.cs.hbs b/packages/cli/templates/csharp/echo/{{name}}.hbs/MainController.cs.hbs
deleted file mode 100644
index b3fada6f6..000000000
--- a/packages/cli/templates/csharp/echo/{{name}}.hbs/MainController.cs.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.Teams.Api.Activities;
-using Microsoft.Teams.Apps;
-using Microsoft.Teams.Apps.Annotations;
-using Microsoft.Teams.Apps.Activities;
-
-namespace {{name}};
-
-[TeamsController("main")]
-public class MainController
-{
-    [Message]
-    public async Task OnMessage([Context] MessageActivity activity, [Context] IContext.Client client)
-    {
-        await client.Send($"you said \"{activity.Text}\"");
-    }
-}
\ No newline at end of file
diff --git a/packages/cli/templates/csharp/echo/{{name}}.hbs/Program.cs.hbs b/packages/cli/templates/csharp/echo/{{name}}.hbs/Program.cs.hbs
index f359407a1..cac2804fc 100644
--- a/packages/cli/templates/csharp/echo/{{name}}.hbs/Program.cs.hbs
+++ b/packages/cli/templates/csharp/echo/{{name}}.hbs/Program.cs.hbs
@@ -1,19 +1,17 @@
-using Microsoft.Teams.Plugins.AspNetCore.DevTools.Extensions;
+using Microsoft.Teams.Apps.Activities;
+using Microsoft.Teams.Apps.Extensions;
 using Microsoft.Teams.Plugins.AspNetCore.Extensions;
-
-using {{name}};
+using Microsoft.Teams.Plugins.AspNetCore.DevTools.Extensions;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.AddTeams();
-builder.AddTeamsDevTools();
-builder.Services.AddTransient<MainController>();
-
+builder.AddTeams().AddTeamsDevTools();
 var app = builder.Build();
+var teams = app.UseTeams();
 
-if (app.Environment.IsDevelopment())
+teams.OnMessage(async context =>
 {
-    app.MapOpenApi();
-}
+    await context.Typing();
+    await context.Send($"you said '{context.Activity.Text}'");
+});
 
-app.UseTeams();
-app.Run();
+app.Run();
\ No newline at end of file
diff --git a/packages/cli/templates/csharp/echo/{{name}}.hbs/{{name}}.csproj.hbs b/packages/cli/templates/csharp/echo/{{name}}.hbs/{{name}}.csproj.hbs
index 994489e7b..7787f2116 100644
--- a/packages/cli/templates/csharp/echo/{{name}}.hbs/{{name}}.csproj.hbs
+++ b/packages/cli/templates/csharp/echo/{{name}}.hbs/{{name}}.csproj.hbs
@@ -1,28 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <Version>0.0.0</Version>
-    <IncludeSymbols>true</IncludeSymbols>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Teams.Api" Version="2.0.0-preview.*" />
-    <PackageReference Include="Microsoft.Teams.Apps" Version="2.0.0-preview.*" />
-    <PackageReference Include="Microsoft.Teams.Cards" Version="2.0.0-preview.*" />
-    <PackageReference Include="Microsoft.Teams.Common" Version="2.0.0-preview.*" />
-    <PackageReference Include="Microsoft.Teams.Extensions.Hosting" Version="2.0.0-preview.*" />
-    <PackageReference Include="Microsoft.Teams.Plugins.AspNetCore" Version="2.0.0-preview.*" />
-    <PackageReference Include="Microsoft.Teams.Plugins.AspNetCore.DevTools" Version="2.0.0-preview.*" />
+    <PackageReference Include="Microsoft.Teams.Plugins.AspNetCore" Version="2.0.*" />
+    <PackageReference Include="Microsoft.Teams.Plugins.AspNetCore.DevTools" Version="2.0.*" />
   </ItemGroup>
 
 </Project>