diff --git a/Client/Hosted.Client.csproj b/Client/Hosted.Client.csproj
index da673fc..413e2d4 100644
--- a/Client/Hosted.Client.csproj
+++ b/Client/Hosted.Client.csproj
@@ -1,18 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <LangVersion>7.3</LangVersion>
-    <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19424.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19424.4" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview9.19424.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview9.19424.4" PrivateAssets="all" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Shared\Hosted.Shared.csproj" />
diff --git a/Client/Program.cs b/Client/Program.cs
index f45f5b9..5006767 100644
--- a/Client/Program.cs
+++ b/Client/Program.cs
@@ -1,16 +1,18 @@
-using Microsoft.AspNetCore.Blazor.Hosting;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Threading.Tasks;
 
 namespace Hosted.Client
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static async Task Main(string[] args)
         {
-            CreateHostBuilder(args).Build().Run();
+            var builder = WebAssemblyHostBuilder.CreateDefault(args);
+            builder.Services.AddHttpClient("", client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress));
+            builder.RootComponents.Add<App>("#app");
+            await builder.Build().RunAsync();
         }
-
-        public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args) =>
-            BlazorWebAssemblyHost.CreateDefaultBuilder()
-                .UseBlazorStartup<Startup>();
     }
 }
diff --git a/Client/Startup.cs b/Client/Startup.cs
index c4d4c81..174ee1a 100644
--- a/Client/Startup.cs
+++ b/Client/Startup.cs
@@ -1,4 +1,3 @@
-using Microsoft.AspNetCore.Components.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Hosted.Client
@@ -8,10 +7,5 @@ public class Startup
         public void ConfigureServices(IServiceCollection services)
         {
         }
-
-        public void Configure(IComponentsApplicationBuilder app)
-        {
-            app.AddComponent<App>("app");
-        }
     }
 }
diff --git a/Client/_Imports.razor b/Client/_Imports.razor
index bc53942..1b4b4a3 100644
--- a/Client/_Imports.razor
+++ b/Client/_Imports.razor
@@ -5,3 +5,4 @@
 @using Microsoft.JSInterop
 @using Hosted.Client
 @using Hosted.Client.Shared
+@using System.Net.Http.Json
diff --git a/Client/wwwroot/css/site.css b/Client/wwwroot/css/site.css
index fa2c7f1..56fc8ec 100644
--- a/Client/wwwroot/css/site.css
+++ b/Client/wwwroot/css/site.css
@@ -4,7 +4,7 @@ html, body {
     font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
 
-app {
+#app {
     position: relative;
     display: flex;
     flex-direction: column;
@@ -103,7 +103,7 @@ app {
 }
 
 @media (min-width: 768px) {
-    app {
+    #app {
         flex-direction: row;
     }
 
diff --git a/Client/wwwroot/index.html b/Client/wwwroot/index.html
index e026ca2..e9cbf92 100644
--- a/Client/wwwroot/index.html
+++ b/Client/wwwroot/index.html
@@ -9,7 +9,7 @@
     <link href="css/site.css" rel="stylesheet" />
 </head>
 <body>
-    <app>Loading...</app>
+    <div id="app">Loading...</div>
 
     <script src="_framework/blazor.webassembly.js"></script>
 </body>
diff --git a/Server/Hosted.Server.csproj b/Server/Hosted.Server.csproj
index 3518d81..6510213 100644
--- a/Server/Hosted.Server.csproj
+++ b/Server/Hosted.Server.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview9.19424.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview9.19424.4" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Server/Startup.cs b/Server/Startup.cs
index 627f122..d3b224a 100644
--- a/Server/Startup.cs
+++ b/Server/Startup.cs
@@ -18,33 +18,27 @@ public void ConfigureServices(IServiceCollection services)
             {
                 options.SerializerSettings.TypeNameHandling = Newtonsoft.Json.TypeNameHandling.Auto;
             });
-            services.AddResponseCompression(opts =>
-            {
-                opts.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(
-                    new[] { "application/octet-stream" });
-            });
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
-            app.UseResponseCompression();
 
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
-                app.UseBlazorDebugging();
+                app.UseWebAssemblyDebugging();
             }
 
             app.UseStaticFiles();
-            app.UseClientSideBlazorFiles<Client.Startup>();
+            app.UseBlazorFrameworkFiles();
 
             app.UseRouting();
 
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapDefaultControllerRoute();
-                endpoints.MapFallbackToClientSideBlazor<Client.Startup>("index.html");
+                endpoints.MapFallbackToFile("index.html");
             });
         }
     }
diff --git a/Shared/Hosted.Shared.csproj b/Shared/Hosted.Shared.csproj
index 2a77f0c..33dd69e 100644
--- a/Shared/Hosted.Shared.csproj
+++ b/Shared/Hosted.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>