diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3735ca..520188a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 6.0.0-beta-001 - 2021-11-11
+
+* Upgrade to Giraffe v6
+* Change the runtime to `net6.0`
+
 ## 5.0.0 - 2021-05-28
 
 ### Added
diff --git a/paket.lock b/paket.lock
index 858c46e..04b2de3 100644
--- a/paket.lock
+++ b/paket.lock
@@ -9,7 +9,7 @@ NUGET
     FSharp.Core (6.0.1) - content: none, redirects: force
     Giraffe (6.0.0-alpha-1)
     Microsoft.AspNetCore.TestHost (5.0.6)
-      System.IO.Pipelines (>= 5.0.1) - restriction: >= net50
+      System.IO.Pipelines (>= 5.0.1) - restriction: >= net5.0
     Microsoft.CodeCoverage (16.10) - restriction: || (>= net45) (>= netcoreapp1.0)
     Microsoft.NET.Test.Sdk (16.10)
       Microsoft.CodeCoverage (>= 16.10) - restriction: || (>= net45) (>= netcoreapp1.0)
@@ -136,7 +136,7 @@ NUGET
     runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - restriction: || (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.2)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.3)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.4)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.5)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.6)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (>= net46) (>= netcoreapp1.0) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netstandard1.5) (>= uap10.0))
     System.AppContext (4.3) - restriction: || (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.4)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.5)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.6)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (>= net46) (>= netcoreapp1.0) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netstandard1.5) (>= uap10.0))
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard1.3) (< netstandard1.6))
-    System.Buffers (4.5.1) - restriction: || (&& (>= monoandroid) (>= net50) (< netcoreapp2.0)) (&& (< monoandroid) (>= net50) (< netcoreapp2.0)) (&& (< monoandroid) (>= net50) (< netstandard2.0)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.2)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.3)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.4)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.5)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.6)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (>= monotouch) (>= net50)) (&& (>= net46) (>= net50) (< netstandard2.0)) (&& (>= net46) (>= netcoreapp1.0) (< netstandard1.4)) (&& (>= net461) (>= net50)) (&& (>= net50) (>= xamarinios)) (&& (>= net50) (>= xamarinmac)) (&& (>= net50) (>= xamarintvos)) (&& (>= net50) (>= xamarinwatchos)) (&& (>= netcoreapp1.0) (< netstandard1.5) (>= uap10.0))
+    System.Buffers (4.5.1) - restriction: || (&& (>= monoandroid) (>= net5.0) (< netcoreapp2.0)) (&& (< monoandroid) (>= net5.0) (< netcoreapp2.0)) (&& (< monoandroid) (>= net5.0) (< netstandard2.0)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.2)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.3)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.4)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.5)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.6)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (>= monotouch) (>= net5.0)) (&& (>= net46) (>= net5.0) (< netstandard2.0)) (&& (>= net46) (>= netcoreapp1.0) (< netstandard1.4)) (&& (>= net461) (>= net5.0)) (&& (>= net5.0) (>= xamarinios)) (&& (>= net5.0) (>= xamarinmac)) (&& (>= net5.0) (>= xamarintvos)) (&& (>= net5.0) (>= xamarinwatchos)) (&& (>= netcoreapp1.0) (< netstandard1.5) (>= uap10.0))
     System.Collections (4.3) - restriction: || (&& (< monoandroid) (>= netcoreapp1.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.2)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.3)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.4)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.5)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.6)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp1.0) (< netstandard1.5) (>= uap10.0)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
@@ -291,7 +291,7 @@ NUGET
       System.Threading.Tasks (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
     System.IO.FileSystem.Primitives (4.3) - restriction: || (&& (< monoandroid) (>= netcoreapp1.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.4)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.5)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.6)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (>= net46) (>= netcoreapp1.0) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netstandard1.5) (>= uap10.0))
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.IO.Pipelines (5.0.1) - restriction: >= net50
+    System.IO.Pipelines (5.0.1) - restriction: >= net5.0
       System.Buffers (>= 4.5.1) - restriction: || (&& (>= monoandroid) (< netcoreapp2.0)) (&& (< monoandroid) (< net46) (< netcoreapp2.0) (>= netstandard2.0)) (&& (< monoandroid) (< net46) (>= netstandard1.3) (< netstandard2.0) (< uap10.1)) (>= monotouch) (&& (>= net46) (< netstandard2.0)) (>= net461) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos)
     System.Linq (4.3) - restriction: || (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.2)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.3)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.4)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.5)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.6)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp1.0) (< netstandard1.5) (>= uap10.0)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wpa81))
       System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.6) (< win8) (< wp8) (< wpa81))
@@ -396,7 +396,7 @@ NUGET
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
     System.Reflection.Metadata (5.0) - restriction: || (&& (< monoandroid) (>= netcoreapp1.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= net45) (>= netcoreapp1.0) (< netstandard1.3)) (&& (>= net451) (>= netcoreapp1.0)) (&& (>= netcoreapp1.0) (< netstandard2.0)) (>= netcoreapp2.1)
       NETStandard.Library (>= 1.6.1) - restriction: && (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)
-      System.Collections.Immutable (>= 5.0) - restriction: || (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< net50) (>= netstandard2.0)) (&& (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)) (>= net461) (&& (< netstandard1.1) (>= portable-net45+win8+wpa81) (< win8)) (&& (< netstandard1.1) (>= win8)) (&& (< netstandard2.0) (>= wpa81))
+      System.Collections.Immutable (>= 5.0) - restriction: || (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< net5.0) (>= netstandard2.0)) (&& (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)) (>= net461) (&& (< netstandard1.1) (>= portable-net45+win8+wpa81) (< win8)) (&& (< netstandard1.1) (>= win8)) (&& (< netstandard2.0) (>= wpa81))
     System.Reflection.Primitives (4.3) - restriction: || (&& (< monoandroid) (>= netcoreapp1.0) (< netcoreapp1.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.2)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.3)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.4)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.5)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.6)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp1.1) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp1.0) (< netstandard1.5) (>= uap10.0)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
diff --git a/src/Thoth.Json.Giraffe.fsproj b/src/Thoth.Json.Giraffe.fsproj
index 6eb889f..653c76c 100644
--- a/src/Thoth.Json.Giraffe.fsproj
+++ b/src/Thoth.Json.Giraffe.fsproj
@@ -7,7 +7,7 @@
     <RepositoryUrl>https://github.com/MangelMaxime/Thoth</RepositoryUrl>
     <PackageTags>fsharp;json;Giraffe;ASP.NET;Core</PackageTags>
     <Authors>Maxime Mangel</Authors>
-    <Version>5.0.0</Version>
+    <Version>6.0.0-beta-001</Version>
   </PropertyGroup>
   <PropertyGroup>
     <TargetFrameworks>net6.0</TargetFrameworks>