diff --git a/README.md b/README.md
index 1e265cf659..a42fc1ff07 100644
--- a/README.md
+++ b/README.md
@@ -40,8 +40,8 @@ The core infrastructure is written in C# using .NET Core with ASP.NET Core. The
 ```
 cd src/Api
 dotnet restore
-dotnet build -f netcoreapp2.0
-dotnet run -f netcoreapp2.0
+dotnet build -f netcoreapp2.1
+dotnet run -f netcoreapp2.1
 ```
 
 visit http://localhost:5000/alive
@@ -51,8 +51,8 @@ visit http://localhost:5000/alive
 ```
 cd src/Identity
 dotnet restore
-dotnet build -f netcoreapp2.0
-dotnet run -f netcoreapp2.0
+dotnet build -f netcoreapp2.1
+dotnet run -f netcoreapp2.1
 ```
 
 visit http://localhost:33657/.well-known/openid-configuration
diff --git a/src/Admin/Admin.csproj b/src/Admin/Admin.csproj
index 9346c462e2..9323dd4114 100644
--- a/src/Admin/Admin.csproj
+++ b/src/Admin/Admin.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <Version>1.22.0</Version>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RootNamespace>Bit.Billing</RootNamespace>
     <UserSecretsId>bitwarden-Admin</UserSecretsId>
   </PropertyGroup>
@@ -12,13 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
-    <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Admin/Dockerfile b/src/Admin/Dockerfile
index bb62a37fe5..904b4a67b6 100644
--- a/src/Admin/Dockerfile
+++ b/src/Admin/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/aspnetcore:2.0.6
+FROM microsoft/dotnet:2.1.2-aspnetcore-runtime
 
 LABEL com.bitwarden.product="bitwarden"
 
diff --git a/src/Admin/build.ps1 b/src/Admin/build.ps1
index 1ea4eb995f..79b6c1cd0f 100644
--- a/src/Admin/build.ps1
+++ b/src/Admin/build.ps1
@@ -5,12 +5,12 @@ echo "`n## Building Admin"
 echo "`nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Clean"
-dotnet clean $dir\Admin.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
+dotnet clean $dir\Admin.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
 echo "Node Build"
 npm --prefix $dir install $dir
 gulp --gulpfile $dir\gulpfile.js build
 echo "Publish"
-dotnet publish $dir\Admin.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
+dotnet publish $dir\Admin.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
 
 echo "`nBuilding docker image"
 docker --version
diff --git a/src/Admin/build.sh b/src/Admin/build.sh
index 7501ca8663..e9c2a14d44 100755
--- a/src/Admin/build.sh
+++ b/src/Admin/build.sh
@@ -8,12 +8,12 @@ echo -e "\n## Building Admin"
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Clean"
-dotnet clean $DIR/Admin.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
+dotnet clean $DIR/Admin.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
 echo "Node Build"
 npm --prefix $DIR install $DIR
 gulp --gulpfile $DIR/gulpfile.js build
 echo "Publish"
-dotnet publish $DIR/Admin.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
+dotnet publish $DIR/Admin.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
 
 echo -e "\nBuilding docker image"
 docker --version
diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj
index d80a8834fd..98ff593c8c 100644
--- a/src/Api/Api.csproj
+++ b/src/Api/Api.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Version>1.22.0</Version>
-    <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
     <RootNamespace>Bit.Api</RootNamespace>
     <UserSecretsId>bitwarden-Api</UserSecretsId>
   </PropertyGroup>
@@ -15,18 +15,13 @@
     <PackageReference Include="jsreport.AspNetCore" Version="1.0.1" />
     <PackageReference Include="jsreport.Binary" Version="1.10.0" />
     <PackageReference Include="jsreport.Local" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.6.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
-    <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Api/Dockerfile b/src/Api/Dockerfile
index 9e443238f5..2b3f2eba45 100644
--- a/src/Api/Dockerfile
+++ b/src/Api/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/aspnetcore:2.0.6
+FROM microsoft/dotnet:2.1.2-aspnetcore-runtime
 
 LABEL com.bitwarden.product="bitwarden"
 
diff --git a/src/Api/build.ps1 b/src/Api/build.ps1
index eb1402f0e5..9d49c33c10 100644
--- a/src/Api/build.ps1
+++ b/src/Api/build.ps1
@@ -5,11 +5,11 @@ echo "`n## Building API"
 echo "`nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Clean"
-dotnet clean $dir\Api.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish\Api
-dotnet clean $dir\..\Jobs\Jobs.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish\Jobs
+dotnet clean $dir\Api.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish\Api
+dotnet clean $dir\..\Jobs\Jobs.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish\Jobs
 echo "Publish"
-dotnet publish $dir\Api.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish\Api
-dotnet publish $dir\..\Jobs\Jobs.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish\Jobs
+dotnet publish $dir\Api.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish\Api
+dotnet publish $dir\..\Jobs\Jobs.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish\Jobs
 
 echo "`nBuilding docker image"
 docker --version
diff --git a/src/Api/build.sh b/src/Api/build.sh
index 54889899c7..da3b5bec99 100755
--- a/src/Api/build.sh
+++ b/src/Api/build.sh
@@ -8,11 +8,11 @@ echo -e "\n## Building API"
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Clean"
-dotnet clean $DIR/Api.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish/Api
-dotnet clean $DIR/../Jobs/Jobs.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish/Jobs
+dotnet clean $DIR/Api.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish/Api
+dotnet clean $DIR/../Jobs/Jobs.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish/Jobs
 echo "Publish"
-dotnet publish $DIR/Api.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish/Api
-dotnet publish $DIR/../Jobs/Jobs.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish/Jobs
+dotnet publish $DIR/Api.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish/Api
+dotnet publish $DIR/../Jobs/Jobs.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish/Jobs
 
 echo -e "\nBuilding docker image"
 docker --version
diff --git a/src/Billing/Billing.csproj b/src/Billing/Billing.csproj
index bf9141e940..25952c2b1c 100644
--- a/src/Billing/Billing.csproj
+++ b/src/Billing/Billing.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Version>1.22.0</Version>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RootNamespace>Bit.Billing</RootNamespace>
     <UserSecretsId>bitwarden-Billing</UserSecretsId>
     <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
@@ -13,12 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
index 19fdb1211c..5c9e82b2b9 100644
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
     <RootNamespace>Bit.Core</RootNamespace>
     <GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
   </PropertyGroup>
@@ -63,15 +63,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="2.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="2.1.2" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
     <PackageReference Include="Serilog.Extensions.Logging.File" Version="1.1.0" />
     <PackageReference Include="Serilog.Sinks.AzureDocumentDB" Version="3.8.0" />
diff --git a/src/Events/Events.csproj b/src/Events/Events.csproj
index 08609fb577..32f96b4e3c 100644
--- a/src/Events/Events.csproj
+++ b/src/Events/Events.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <Version>1.22.0</Version>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RootNamespace>Bit.Events</RootNamespace>
     <UserSecretsId>bitwarden-Events</UserSecretsId>
     <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
@@ -10,12 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.6.0" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.1" />
-    <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Icons/Dockerfile b/src/Icons/Dockerfile
index bb62a37fe5..904b4a67b6 100644
--- a/src/Icons/Dockerfile
+++ b/src/Icons/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/aspnetcore:2.0.6
+FROM microsoft/dotnet:2.1.2-aspnetcore-runtime
 
 LABEL com.bitwarden.product="bitwarden"
 
diff --git a/src/Icons/Icons.csproj b/src/Icons/Icons.csproj
index cb1c33111f..51fb2aa3cf 100644
--- a/src/Icons/Icons.csproj
+++ b/src/Icons/Icons.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <Version>1.22.0</Version>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RootNamespace>Bit.Icons</RootNamespace>
     <UserSecretsId>bitwarden-Icons</UserSecretsId>
     <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
@@ -10,12 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="AngleSharp" Version="0.9.10" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
-    <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Icons/build.ps1 b/src/Icons/build.ps1
index 2a6db79540..bd70bb4822 100644
--- a/src/Icons/build.ps1
+++ b/src/Icons/build.ps1
@@ -5,9 +5,9 @@ echo "`n## Building Icons"
 echo "`nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Clean"
-dotnet clean $dir\Icons.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
+dotnet clean $dir\Icons.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
 echo "Publish"
-dotnet publish $dir\Icons.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
+dotnet publish $dir\Icons.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
 
 echo "`nBuilding docker image"
 docker --version
diff --git a/src/Icons/build.sh b/src/Icons/build.sh
index 994c92f6ee..883957a71e 100755
--- a/src/Icons/build.sh
+++ b/src/Icons/build.sh
@@ -8,9 +8,9 @@ echo -e "\n## Building Icons"
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Clean"
-dotnet clean $DIR/Icons.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
+dotnet clean $DIR/Icons.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
 echo "Publish"
-dotnet publish $DIR/Icons.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
+dotnet publish $DIR/Icons.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
 
 echo -e "\nBuilding docker image"
 docker --version
diff --git a/src/Identity/Dockerfile b/src/Identity/Dockerfile
index bb62a37fe5..904b4a67b6 100644
--- a/src/Identity/Dockerfile
+++ b/src/Identity/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/aspnetcore:2.0.6
+FROM microsoft/dotnet:2.1.2-aspnetcore-runtime
 
 LABEL com.bitwarden.product="bitwarden"
 
diff --git a/src/Identity/Identity.csproj b/src/Identity/Identity.csproj
index dcaa10d472..f3df80f226 100644
--- a/src/Identity/Identity.csproj
+++ b/src/Identity/Identity.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Version>1.22.0</Version>
-    <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
     <RootNamespace>Bit.Identity</RootNamespace>
     <UserSecretsId>bitwarden-Identity</UserSecretsId>
     <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
@@ -14,13 +14,8 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.0.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
-    <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Identity/build.ps1 b/src/Identity/build.ps1
index 8a5e5b369d..811b001636 100644
--- a/src/Identity/build.ps1
+++ b/src/Identity/build.ps1
@@ -5,9 +5,9 @@ echo "`n## Building Identity"
 echo "`nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Clean"
-dotnet clean $dir\Identity.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
+dotnet clean $dir\Identity.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
 echo "Publish"
-dotnet publish $dir\Identity.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
+dotnet publish $dir\Identity.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
 
 echo "`nBuilding docker image"
 docker --version
diff --git a/src/Identity/build.sh b/src/Identity/build.sh
index 225b977049..522404f2ed 100755
--- a/src/Identity/build.sh
+++ b/src/Identity/build.sh
@@ -8,9 +8,9 @@ echo -e "\n## Building Identity"
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Clean"
-dotnet clean $DIR/Identity.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
+dotnet clean $DIR/Identity.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
 echo "Publish"
-dotnet publish $DIR/Identity.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
+dotnet publish $DIR/Identity.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
 
 echo -e "\nBuilding docker image"
 docker --version
diff --git a/src/Jobs/Jobs.csproj b/src/Jobs/Jobs.csproj
index 7758cc8188..d176e3234e 100644
--- a/src/Jobs/Jobs.csproj
+++ b/src/Jobs/Jobs.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RootNamespace>Bit.Jobs</RootNamespace>
     <UserSecretsId>bitwarden-Jobs</UserSecretsId>
   </PropertyGroup>
@@ -14,16 +14,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/util/Mail/Mail.csproj b/util/Mail/Mail.csproj
index f723dd8e8b..907fa1b9e4 100644
--- a/util/Mail/Mail.csproj
+++ b/util/Mail/Mail.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RootNamespace>Bit.Mail</RootNamespace>
   </PropertyGroup>
 
@@ -12,11 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
   </ItemGroup>
 
 </Project>
diff --git a/util/Server/Dockerfile b/util/Server/Dockerfile
index 896cef3b8f..1473a2e09f 100644
--- a/util/Server/Dockerfile
+++ b/util/Server/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/aspnetcore:2.0.6
+FROM microsoft/dotnet:2.1.2-aspnetcore-runtime
 
 LABEL com.bitwarden.product="bitwarden"
 
diff --git a/util/Server/Server.csproj b/util/Server/Server.csproj
index 103bf9acce..0afebe25a1 100644
--- a/util/Server/Server.csproj
+++ b/util/Server/Server.csproj
@@ -1,17 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
     <RootNamespace>Bit.Server</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
   </ItemGroup>
 
 </Project>
diff --git a/util/Setup/Dockerfile b/util/Setup/Dockerfile
index bab4468127..b0b7a58d24 100644
--- a/util/Setup/Dockerfile
+++ b/util/Setup/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.0.6-runtime
+FROM microsoft/dotnet:2.1.2-runtime
 
 LABEL com.bitwarden.product="bitwarden"
 
diff --git a/util/Setup/Setup.csproj b/util/Setup/Setup.csproj
index a65887ddbc..8237cfde5f 100644
--- a/util/Setup/Setup.csproj
+++ b/util/Setup/Setup.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <NoWarn>1701;1702;1705;NU1701</NoWarn>
     <RootNamespace>Bit.Setup</RootNamespace>
   </PropertyGroup>
@@ -35,7 +35,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="dbup" Version="3.3.5" />
   </ItemGroup>
diff --git a/util/Setup/build.ps1 b/util/Setup/build.ps1
index 59e7b60a6f..1b1cc08422 100644
--- a/util/Setup/build.ps1
+++ b/util/Setup/build.ps1
@@ -5,9 +5,9 @@ echo "`n## Building Setup"
 echo "`nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Clean"
-dotnet clean $dir\Setup.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
+dotnet clean $dir\Setup.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
 echo "Publish"
-dotnet publish $dir\Setup.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
+dotnet publish $dir\Setup.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
 
 echo "`nBuilding docker image"
 docker --version
diff --git a/util/Setup/build.sh b/util/Setup/build.sh
index 8a3335af81..782f393459 100755
--- a/util/Setup/build.sh
+++ b/util/Setup/build.sh
@@ -8,9 +8,9 @@ echo -e "\n## Building Setup"
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Clean"
-dotnet clean $DIR/Setup.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
+dotnet clean $DIR/Setup.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
 echo "Publish"
-dotnet publish $DIR/Setup.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
+dotnet publish $DIR/Setup.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
 
 echo -e "\nBuilding docker image"
 docker --version