diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/settings.VisualStudio.json b/src/Templates/Boilerplate/Bit.Boilerplate/settings.VisualStudio.json
index d92d4093bb..2825656a03 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/settings.VisualStudio.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/settings.VisualStudio.json
@@ -8,7 +8,9 @@
   "debugging.hotReload.applyOnFileSave": true,
   "debugging.general.disableJITOptimization": true,
   "debugging.hotReload.enableForNoDebugLaunch": true,
+  "debugging.general.closeConsoleWhenDebuggingEnds": true,
   "projectsAndSolutions.aspNetCore.general.hotReloadCssChanges": true,
+  "projectsAndSolutions.webProjects.enableDebugTargetsObserver": false,
   "copilot.general.completions.enableNextEditSuggestions": true,
   "copilot.general.editor.enableAdaptivePaste": true,
   "copilot.general.chat.enablePlanning": true,
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
index b8beb29472..5b9fa71036 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
@@ -417,7 +417,7 @@ void AddDbContext(DbContextOptionsBuilder options)
 
         services.AddHttpClient<NugetStatisticsService>(c =>
         {
-            c.Timeout = TimeSpan.FromSeconds(3);
+            c.Timeout = TimeSpan.FromSeconds(20);
             c.BaseAddress = new Uri("https://azuresearch-usnc.nuget.org");
             c.DefaultRequestVersion = HttpVersion.Version11;
         });
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj
index c2d720bc6b..d78c4c3551 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj
@@ -24,6 +24,8 @@
         <ProjectReference Include="..\Boilerplate.Server.Shared\Boilerplate.Server.Shared.csproj" />
         <ProjectReference Condition=" '$(api)' == 'Integrated' OR '$(api)' == ''" Include="..\Boilerplate.Server.Api\Boilerplate.Server.Api.csproj" />
         <ProjectReference Include="..\..\Client\Boilerplate.Client.Web\Boilerplate.Client.Web.csproj" />
+        <ProjectReference Include="..\..\Client\Boilerplate.Client.Core\Boilerplate.Client.Core.csproj" />
+        <!-- By referencing Client.Core in Server.Web project, you can build the Client.Web project just once and then unload it during development with Blazor Server, which significantly speeds up build times. -->
     </ItemGroup>
 
     <ItemGroup>