diff --git a/.github/workflows/onpush.yml b/.github/workflows/onpush.yml
index 7af6200..04a509d 100644
--- a/.github/workflows/onpush.yml
+++ b/.github/workflows/onpush.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.202'
+          dotnet-version: '6.0.412'
 
       - name: Run build
         run:
diff --git a/AzureBillingExporter.Tests/AzureBillingExporter.Tests.csproj b/AzureBillingExporter.Tests/AzureBillingExporter.Tests.csproj
index 917f880..b395740 100644
--- a/AzureBillingExporter.Tests/AzureBillingExporter.Tests.csproj
+++ b/AzureBillingExporter.Tests/AzureBillingExporter.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
diff --git a/Dockerfile b/Dockerfile
index a265f5f..0def3ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-env
+FROM mcr.microsoft.com/dotnet/core/sdk:6.0-bullseye-slim AS build-env
 WORKDIR /app
 
 # Copy csproj and restore as distinct layers
@@ -11,9 +11,9 @@ COPY ./src/queries/get_daily_or_monthly_costs.json ./queries/get_daily_or_monthl
 RUN dotnet publish -c Release -o out
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1
+FROM mcr.microsoft.com/dotnet/runtime:6.0.20-bullseye-slim
 WORKDIR /app
 EXPOSE 80
 
 COPY --from=build-env /app/out .
-ENTRYPOINT ["dotnet", "AzureBillingExporter.dll"]
\ No newline at end of file
+ENTRYPOINT ["dotnet", "AzureBillingExporter.dll"]
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..ab7f242
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "6.0.412",
+    "rollForward": "latestFeature"
+  }
+}
diff --git a/src/AzureBillingExporter.csproj b/src/AzureBillingExporter.csproj
index d0d30d8..77422b0 100644
--- a/src/AzureBillingExporter.csproj
+++ b/src/AzureBillingExporter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     </PropertyGroup>