diff --git a/Hub/Service/Dockerfile b/Hub/Service/Dockerfile
index 6d6e557..96fe6a9 100644
--- a/Hub/Service/Dockerfile
+++ b/Hub/Service/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime-stretch-slim AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0.0-preview7-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk-stretch AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-preview7-buster AS build
 WORKDIR /src
 COPY ["./Service.csproj", "./"]
 RUN dotnet restore "Service.csproj"
diff --git a/Hub/Service/Service.csproj b/Hub/Service/Service.csproj
index 5c366c5..badf8df 100644
--- a/Hub/Service/Service.csproj
+++ b/Hub/Service/Service.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <AssemblyName>ChrisKaczor.HomeMonitor.Hub.Service</AssemblyName>
     <RootNamespace>ChrisKaczor.HomeMonitor.Hub.Service</RootNamespace>
@@ -10,9 +10,6 @@
 
   <ItemGroup>
     <PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
   </ItemGroup>
-
-
 </Project>
diff --git a/Hub/Service/Startup.cs b/Hub/Service/Startup.cs
index 0583264..b8de542 100644
--- a/Hub/Service/Startup.cs
+++ b/Hub/Service/Startup.cs
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace ChrisKaczor.HomeMonitor.Hub.Service
 {
@@ -10,21 +11,25 @@ namespace ChrisKaczor.HomeMonitor.Hub.Service
     {
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
 
-            services.AddSignalR().AddJsonProtocol(options => { options.PayloadSerializerSettings.ContractResolver = new Newtonsoft.Json.Serialization.DefaultContractResolver(); });
+            services.AddSignalR().AddJsonProtocol(options =>
+            {
+                options.WriteIndented = false;
+            });
         }
 
-        public void Configure(IApplicationBuilder applicationBuilder, IHostingEnvironment environment)
+        public void Configure(IApplicationBuilder applicationBuilder, IWebHostEnvironment environment)
         {
             if (environment.IsDevelopment())
             {
                 applicationBuilder.UseDeveloperExceptionPage();
             }
 
-            applicationBuilder.UseSignalR(routes => { routes.MapHub<WeatherHub>("/weatherHub"); });
-
-            applicationBuilder.UseMvc();
+            applicationBuilder.UseEndpoints(endpoints =>
+            {
+                endpoints.MapHub<WeatherHub>("/weatherHub");
+            });
         }
     }
 }
\ No newline at end of file