diff --git a/src/Templates/Microsoft.FluentUI.AspNetCore.Templates.csproj b/src/Templates/Microsoft.FluentUI.AspNetCore.Templates.csproj
index 216c5fdb0a..fd40febfc6 100644
--- a/src/Templates/Microsoft.FluentUI.AspNetCore.Templates.csproj
+++ b/src/Templates/Microsoft.FluentUI.AspNetCore.Templates.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk" InitialTargets="AddTemplatesToPackageAsContent">
-
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
 		<Authors>Microsoft</Authors>
@@ -40,18 +39,18 @@
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageOutputPath>$(SolutionDir)artifacts</PackageOutputPath>
 	</PropertyGroup>
-	
+
 	 <PropertyGroup>
 		<UsePublicApiAnalyzers>false</UsePublicApiAnalyzers>
-	</PropertyGroup>  
+	</PropertyGroup>
 
 	<ItemGroup>
 		<None Include="templates\**\*" />
 		<Content Include="content\**\*" Exclude="content\**\bin\**;content\**\obj\**" />
-		
+
 		<None Include="README.md" Pack="true" PackagePath="\" />
 		<None Include="..\..\icon.png" Pack="true" PackagePath="\" />
-		
+
 	</ItemGroup>
 
 	<ItemGroup>
@@ -75,7 +74,7 @@
 			<Content Include="%(_TemplatesForPackage.Identity)" PackagePath="content/content/%(_TemplatesForPackage.RecursiveDir)" />
 		</ItemGroup>
 	</Target>
-	
+
 	<!-- Replaces the versions referenced by the templates projects to use the version of the packages being live-built -->
 	<Target Name="ReplacePackageVersionOnTemplates" DependsOnTargets="CopyTemplatesToIntermediateOutputPath">
 
@@ -89,6 +88,7 @@
 		<WriteLinesToFile File="%(TemplateProjectFiles.DestinationFile)"
 											Lines="$([System.IO.File]::ReadAllText('%(TemplateProjectFiles.FullPath)')
 																								 .Replace('!!REPLACE_WITH_LATEST_VERSION!!', '$(PackageVersion)')
+                                                 .Replace('!!REPLACE_WITH_LATEST_ASPIRE_VERSION!!', '$(AspirePackageVersion)')
 																								 .Replace('!!REPLACE_WITH_ASPNETCORE_8_VERSION!!', '$(MicrosoftAspNetCorePackageVersionForNet8)')
 																								 .Replace('!!REPLACE_WITH_ASPNETCORE_9_VERSION!!', '$(MicrosoftAspNetCorePackageVersionForNet9)')
 																								 .Replace('!!REPLACE_WITH_DOTNET_EXTENSIONS_VERSION!!', '$(MicrosoftExtensionsHttpResiliencePackageVersion)'))"
diff --git a/src/Templates/templates/aspire-starter/8.2/Aspire-StarterApplication.1.Web/Aspire-StarterApplication.1.Web.csproj b/src/Templates/templates/aspire-starter/8.2/Aspire-StarterApplication.1.Web/Aspire-StarterApplication.1.Web.csproj
index fc6660cf77..b42efd7453 100644
--- a/src/Templates/templates/aspire-starter/8.2/Aspire-StarterApplication.1.Web/Aspire-StarterApplication.1.Web.csproj
+++ b/src/Templates/templates/aspire-starter/8.2/Aspire-StarterApplication.1.Web/Aspire-StarterApplication.1.Web.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\XmlEncodedProjectName.ServiceDefaults\XmlEncodedProjectName.ServiceDefaults.csproj" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="[4.11.0,)" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="[4.11.0,)" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
   </ItemGroup>
 
   <!--#if (UseRedisCache) -->
diff --git a/src/Templates/templates/aspire-starter/8.2/Aspire-StarterApplication.1.Web/Components/Pages/Weather.razor b/src/Templates/templates/aspire-starter/8.2/Aspire-StarterApplication.1.Web/Components/Pages/Weather.razor
index 939ec46ba2..abcb8cfe44 100644
--- a/src/Templates/templates/aspire-starter/8.2/Aspire-StarterApplication.1.Web/Components/Pages/Weather.razor
+++ b/src/Templates/templates/aspire-starter/8.2/Aspire-StarterApplication.1.Web/Components/Pages/Weather.razor
@@ -1,7 +1,6 @@
 @page "/weather"
-@attribute [StreamRendering(true)]
+@rendermode InteractiveServer
 @attribute [OutputCache(Duration = 5)]
-
 @inject WeatherApiClient WeatherApi
 
 <PageTitle>Weather</PageTitle>
diff --git a/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.AppHost/Aspire-StarterApplication.1.AppHost.csproj b/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.AppHost/Aspire-StarterApplication.1.AppHost.csproj
index 9c04e40b19..8dbdab7bf4 100644
--- a/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.AppHost/Aspire-StarterApplication.1.AppHost.csproj
+++ b/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.AppHost/Aspire-StarterApplication.1.AppHost.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Sdk Name="Aspire.AppHost.Sdk" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="!!REPLACE_WITH_LATEST_ASPIRE_VERSION!!" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -17,9 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="!!REPLACE_WITH_LATEST_ASPIRE_VERSION!!" />
   <!--#if (UseRedisCache) -->
-    <PackageReference Include="Aspire.Hosting.Redis" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
+    <PackageReference Include="Aspire.Hosting.Redis" Version="!!REPLACE_WITH_LATEST_ASPIRE_VERSION!!" />
   <!--#endif -->
   </ItemGroup>
 
diff --git a/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.ServiceDefaults/Aspire-StarterApplication.1.ServiceDefaults.csproj b/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.ServiceDefaults/Aspire-StarterApplication.1.ServiceDefaults.csproj
index 44c1880265..996f15b2df 100644
--- a/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.ServiceDefaults/Aspire-StarterApplication.1.ServiceDefaults.csproj
+++ b/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.ServiceDefaults/Aspire-StarterApplication.1.ServiceDefaults.csproj
@@ -11,7 +11,7 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="!!REPLACE_WITH_DOTNET_EXTENSIONS_VERSION!!" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="!!REPLACE_WITH_LATEST_ASPIRE_VERSION!!" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
diff --git a/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.Tests/Aspire-StarterApplication.1.Tests.csproj b/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.Tests/Aspire-StarterApplication.1.Tests.csproj
index d337a33674..1d770f108b 100644
--- a/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.Tests/Aspire-StarterApplication.1.Tests.csproj
+++ b/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.Tests/Aspire-StarterApplication.1.Tests.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.Testing" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
+    <PackageReference Include="Aspire.Hosting.Testing" Version="!!REPLACE_WITH_LATEST_ASPIRE_VERSION!!" />
     <PackageReference Include="coverlet.collector" Version="6.0.2" Condition=" $(TestFramework) == 'xUnit.net' " />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" Condition=" $(TestFramework) != 'MSTest' " />
     <PackageReference Include="MSTest" Version="3.4.3" Condition=" $(TestFramework) == 'MSTest' " />
diff --git a/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.Web/Aspire-StarterApplication.1.Web.csproj b/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.Web/Aspire-StarterApplication.1.Web.csproj
index dda391bedd..0b96642947 100644
--- a/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.Web/Aspire-StarterApplication.1.Web.csproj
+++ b/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.Web/Aspire-StarterApplication.1.Web.csproj
@@ -8,13 +8,13 @@
 
   <ItemGroup>
     <ProjectReference Include="..\XmlEncodedProjectName.ServiceDefaults\XmlEncodedProjectName.ServiceDefaults.csproj" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="[4.11.0,)" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="[4.11.0,)" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
   </ItemGroup>
 
   <!--#if (UseRedisCache) -->
   <ItemGroup>
-    <PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
+    <PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="!!REPLACE_WITH_LATEST_ASPIRE_VERSION!!" />
   </ItemGroup>
 
   <!--#endif -->
diff --git a/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.Web/Components/Pages/Weather.razor b/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.Web/Components/Pages/Weather.razor
index 939ec46ba2..8748b28532 100644
--- a/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.Web/Components/Pages/Weather.razor
+++ b/src/Templates/templates/aspire-starter/9.0/Aspire-StarterApplication.1.Web/Components/Pages/Weather.razor
@@ -1,5 +1,5 @@
 @page "/weather"
-@attribute [StreamRendering(true)]
+@rendermode InteractiveServer
 @attribute [OutputCache(Duration = 5)]
 
 @inject WeatherApiClient WeatherApi
diff --git a/src/Templates/templates/blazorweb-csharp/BlazorWeb-CSharp.Client/BlazorWeb-CSharp.Client.csproj b/src/Templates/templates/blazorweb-csharp/BlazorWeb-CSharp.Client/BlazorWeb-CSharp.Client.csproj
index 5b1cdfc351..72ebafd709 100644
--- a/src/Templates/templates/blazorweb-csharp/BlazorWeb-CSharp.Client/BlazorWeb-CSharp.Client.csproj
+++ b/src/Templates/templates/blazorweb-csharp/BlazorWeb-CSharp.Client/BlazorWeb-CSharp.Client.csproj
@@ -15,8 +15,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="!!REPLACE_WITH_ASPNETCORE_9_VERSION!!" Condition="'$(Framework)' == 'net9.0'" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="!!REPLACE_WITH_ASPNETCORE_8_VERSION!!" Condition="'$(IndividualLocalAuth)' == 'True' AND '$(Framework)' == 'net8.0'" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="!!REPLACE_WITH_ASPNETCORE_9_VERSION!!" Condition="'$(IndividualLocalAuth)' == 'True' AND '$(Framework)' == 'net9.0'" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="[4.11.0,)" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="[4.11.0,)" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Templates/templates/blazorweb-csharp/BlazorWeb-CSharp/BlazorWeb-CSharp.csproj b/src/Templates/templates/blazorweb-csharp/BlazorWeb-CSharp/BlazorWeb-CSharp.csproj
index 60785353bc..cc6a048cc3 100644
--- a/src/Templates/templates/blazorweb-csharp/BlazorWeb-CSharp/BlazorWeb-CSharp.csproj
+++ b/src/Templates/templates/blazorweb-csharp/BlazorWeb-CSharp/BlazorWeb-CSharp.csproj
@@ -35,7 +35,7 @@
 
   <!--#endif -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="[4.11.0,)" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="[4.11.0,)" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
   </ItemGroup>
 </Project>
diff --git a/src/Templates/templates/blazorweb-csharp/BlazorWeb-CSharp/Components/_Imports.razor b/src/Templates/templates/blazorweb-csharp/BlazorWeb-CSharp/Components/_Imports.razor
index f4cd51556d..9b3af88964 100644
--- a/src/Templates/templates/blazorweb-csharp/BlazorWeb-CSharp/Components/_Imports.razor
+++ b/src/Templates/templates/blazorweb-csharp/BlazorWeb-CSharp/Components/_Imports.razor
@@ -14,6 +14,8 @@
 @using BlazorWeb_CSharp
 @*#if (UseWebAssembly) -->
 @using BlazorWeb_CSharp.Client
+##endif*@
+@*#if (UseWebAssembly && SampleContent) -->
 @using BlazorWeb_CSharp.Client.Layout
 ##endif*@
 @using BlazorWeb_CSharp.Components
diff --git a/src/Templates/templates/componentswebassembly-csharp/ComponentsWebAssembly-CSharp.csproj b/src/Templates/templates/componentswebassembly-csharp/ComponentsWebAssembly-CSharp.csproj
index eced728e2b..2a7f6c84c2 100644
--- a/src/Templates/templates/componentswebassembly-csharp/ComponentsWebAssembly-CSharp.csproj
+++ b/src/Templates/templates/componentswebassembly-csharp/ComponentsWebAssembly-CSharp.csproj
@@ -14,8 +14,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.0" Condition="'$(IndividualLocalAuth)' == 'true'" />
     <PackageReference Include="Microsoft.Authentication.WebAssembly.Msal" Version="9.0.0" Condition="'$(OrganizationalAuth)' == 'true' OR '$(IndividualB2CAuth)' == 'true'" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="[4.11.0,)" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="[4.11.0,)" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
   </ItemGroup>
 
   <!--#if PWA -->
diff --git a/src/Templates/templates/maui-blazor-solution/MauiApp.1.Shared/MauiApp.1.Shared.csproj b/src/Templates/templates/maui-blazor-solution/MauiApp.1.Shared/MauiApp.1.Shared.csproj
index d91d0ae2c3..bb40f653d6 100644
--- a/src/Templates/templates/maui-blazor-solution/MauiApp.1.Shared/MauiApp.1.Shared.csproj
+++ b/src/Templates/templates/maui-blazor-solution/MauiApp.1.Shared/MauiApp.1.Shared.csproj
@@ -12,8 +12,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="[4.11.0,)" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="[4.11.0,)" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Templates/templates/maui-blazor-solution/MauiApp.1.Web.Client/MauiApp.1.Web.Client.csproj b/src/Templates/templates/maui-blazor-solution/MauiApp.1.Web.Client/MauiApp.1.Web.Client.csproj
index e67ffd3e51..a14cb361f4 100644
--- a/src/Templates/templates/maui-blazor-solution/MauiApp.1.Web.Client/MauiApp.1.Web.Client.csproj
+++ b/src/Templates/templates/maui-blazor-solution/MauiApp.1.Web.Client/MauiApp.1.Web.Client.csproj
@@ -11,12 +11,12 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.0" Condition="'$(IndividualLocalAuth)' == 'True'" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.*-*" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.*-*" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\XmlEncodedAppName.Shared\XmlEncodedAppName.Shared.csproj" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Templates/templates/maui-blazor-solution/MauiApp.1.Web/MauiApp.1.Web.csproj b/src/Templates/templates/maui-blazor-solution/MauiApp.1.Web/MauiApp.1.Web.csproj
index e5fcddc837..f1ed16745c 100644
--- a/src/Templates/templates/maui-blazor-solution/MauiApp.1.Web/MauiApp.1.Web.csproj
+++ b/src/Templates/templates/maui-blazor-solution/MauiApp.1.Web/MauiApp.1.Web.csproj
@@ -31,8 +31,8 @@
   </ItemGroup>
   <!--#endif -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="[4.11.0,)" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="[4.11.0,)" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
   </ItemGroup>
 
 </Project>