diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2006f0792..b1a9f92b3 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -28,7 +28,7 @@
         "name": "host: main (dotnet 8)",
         "type": "coreclr",
         "request": "launch",
-        "preLaunchTask": "build-host-main",
+        "preLaunchTask": "build-host-main-8",
         "program": "${workspaceFolder}/hosts/main/bin/Debug/net8.0/Host.Main.dll",
         "args": [],
         "cwd": "${workspaceFolder}/hosts/main",
@@ -64,7 +64,7 @@
         "name": "host: AspNetIdentity (dotnet 8)",
         "type": "coreclr",
         "request": "launch",
-        "preLaunchTask": "build-host-aspnetidentity",
+        "preLaunchTask": "build-host-aspnetidentity-8",
         "program": "${workspaceFolder}/hosts/AspNetIdentity/bin/Debug/net8.0/Host.AspNetIdentity.dll",
         "args": [],
         "cwd": "${workspaceFolder}/hosts/AspNetIdentity",
@@ -100,7 +100,7 @@
         "name": "host: EntityFramework (dotnet 8)",
         "type": "coreclr",
         "request": "launch",
-        "preLaunchTask": "build-host-entityframework",
+        "preLaunchTask": "build-host-entityframework-8",
         "program": "${workspaceFolder}/hosts/EntityFramework/bin/Debug/net8.0/Host.EntityFramework.dll",
         "args": [],
         "cwd": "${workspaceFolder}/hosts/EntityFramework",
@@ -136,7 +136,7 @@
         "name": "host: Configuration (dotnet 8)",
         "type": "coreclr",
         "request": "launch",
-        "preLaunchTask": "build-host-configuration",
+        "preLaunchTask": "build-host-configuration-8",
         "program": "${workspaceFolder}/hosts/Configuration/bin/Debug/net8.0/Host.Configuration.dll",
         "args": [],
         "cwd": "${workspaceFolder}/hosts/Configuration",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 511bb7963..39eb18cdd 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -20,48 +20,104 @@
     //-------
     // Hosts
     //-------
+    {
+      "label": "build-host-main-8",
+      "type": "process",
+      "command": "dotnet",
+      "args": [
+          "build",
+          "--framework=net8.0",
+          "${workspaceFolder}/hosts/main/Host.Main.csproj",
+          "/property:GenerateFullPaths=true",
+          "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
     {
       "label": "build-host-main",
       "type": "process",
       "command": "dotnet",
       "args": [
           "build",
+          "--framework=net9.0",
           "${workspaceFolder}/hosts/main/Host.Main.csproj",
           "/property:GenerateFullPaths=true",
           "/consoleloggerparameters:NoSummary"
       ],
       "problemMatcher": "$msCompile"
     },
+    {
+      "label": "build-host-entityframework-8",
+      "type": "process",
+      "command": "dotnet",
+      "args": [
+          "build",
+          "--framework=net8.0",
+          "${workspaceFolder}/hosts/EntityFramework/Host.EntityFramework.csproj",
+          "/property:GenerateFullPaths=true",
+          "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
     {
       "label": "build-host-entityframework",
       "type": "process",
       "command": "dotnet",
       "args": [
           "build",
+          "--framework=net9.0",
           "${workspaceFolder}/hosts/EntityFramework/Host.EntityFramework.csproj",
           "/property:GenerateFullPaths=true",
           "/consoleloggerparameters:NoSummary"
       ],
       "problemMatcher": "$msCompile"
     },
+    {
+      "label": "build-host-aspnetidentity-8",
+      "type": "process",
+      "command": "dotnet",
+      "args": [
+          "build",
+          "--framework=net8.0",
+          "${workspaceFolder}/hosts/AspNetIdentity/Host.AspNetIdentity.csproj",
+          "/property:GenerateFullPaths=true",
+          "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
     {
       "label": "build-host-aspnetidentity",
       "type": "process",
       "command": "dotnet",
       "args": [
           "build",
+          "--framework=net9.0",
           "${workspaceFolder}/hosts/AspNetIdentity/Host.AspNetIdentity.csproj",
           "/property:GenerateFullPaths=true",
           "/consoleloggerparameters:NoSummary"
       ],
       "problemMatcher": "$msCompile"
     },
+    {
+      "label": "build-host-configuration-8",
+      "type": "process",
+      "command": "dotnet",
+      "args": [
+          "build",
+          "--framework=net8.0",
+          "${workspaceFolder}/hosts/Configuration/Host.Configuration.csproj",
+          "/property:GenerateFullPaths=true",
+          "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
     {
       "label": "build-host-configuration",
       "type": "process",
       "command": "dotnet",
       "args": [
           "build",
+          "--framework=net9.0",
           "${workspaceFolder}/hosts/Configuration/Host.Configuration.csproj",
           "/property:GenerateFullPaths=true",
           "/consoleloggerparameters:NoSummary"
diff --git a/clients/src/APIs/DPoPApi/DPoP/DPoPJwtBearerEvents.cs b/clients/src/APIs/DPoPApi/DPoP/DPoPJwtBearerEvents.cs
index d4f91c109..8eb70654a 100644
--- a/clients/src/APIs/DPoPApi/DPoP/DPoPJwtBearerEvents.cs
+++ b/clients/src/APIs/DPoPApi/DPoP/DPoPJwtBearerEvents.cs
@@ -5,7 +5,7 @@
 using Microsoft.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
-using static IdentityModel.OidcConstants;
+using static Duende.IdentityModel.OidcConstants;
 
 namespace DPoPApi;
 
diff --git a/clients/src/ConsoleCode/Program.cs b/clients/src/ConsoleCode/Program.cs
index adfe6f5a9..484d1a924 100644
--- a/clients/src/ConsoleCode/Program.cs
+++ b/clients/src/ConsoleCode/Program.cs
@@ -1,6 +1,6 @@
 using Clients;
 using Duende.IdentityModel.Client;
-using Duende.IdentityModel.OidcClient;
+using IdentityModel.OidcClient;
 using Serilog;
 using System;
 using System.Net.Http;
diff --git a/clients/src/ConsoleCode/SystemBrowser.cs b/clients/src/ConsoleCode/SystemBrowser.cs
index d25fa6b08..e687b557d 100644
--- a/clients/src/ConsoleCode/SystemBrowser.cs
+++ b/clients/src/ConsoleCode/SystemBrowser.cs
@@ -1,4 +1,4 @@
-using Duende.IdentityModel.OidcClient.Browser;
+using IdentityModel.OidcClient.Browser;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
diff --git a/clients/src/ConsoleDcrClient/Program.cs b/clients/src/ConsoleDcrClient/Program.cs
index e086110af..9c6bc88a8 100644
--- a/clients/src/ConsoleDcrClient/Program.cs
+++ b/clients/src/ConsoleDcrClient/Program.cs
@@ -30,8 +30,21 @@ static async Task RegisterClient()
             Scope = "resource1.scope1 resource2.scope1 IdentityServerApi"
         }
     };
-    request.Document.Extensions.Add("client_id", "client");
-    request.Document.Extensions.Add("client_secret", "secret");
+
+    var json = JsonDocument.Parse(
+        """
+        {
+          "client_id": "client",
+          "client_secret": "secret"
+        }
+        """
+    );
+
+    var clientJson = json.RootElement.GetProperty("client_id");
+    var secretJson = json.RootElement.GetProperty("client_secret");
+    
+    request.Document.Extensions!.Add("client_id", clientJson);
+    request.Document.Extensions.Add("client_secret", secretJson);
 
 
     var serialized = JsonSerializer.Serialize(request.Document);
diff --git a/clients/src/ConsoleResourceIndicators/Program.cs b/clients/src/ConsoleResourceIndicators/Program.cs
index 80ce0124d..a69d57fb3 100644
--- a/clients/src/ConsoleResourceIndicators/Program.cs
+++ b/clients/src/ConsoleResourceIndicators/Program.cs
@@ -1,13 +1,13 @@
 using Clients;
-using Duende.IdentityModel.OidcClient;
+using IdentityModel.OidcClient;
 using Serilog;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Duende.IdentityModel;
-using Duende.IdentityModel.Client;
+using IdentityModel;
+using IdentityModel.Client;
 
 namespace ConsoleResourceIndicators
 {
diff --git a/clients/src/ConsoleResourceIndicators/SystemBrowser.cs b/clients/src/ConsoleResourceIndicators/SystemBrowser.cs
index 449010cec..2214cc9ee 100644
--- a/clients/src/ConsoleResourceIndicators/SystemBrowser.cs
+++ b/clients/src/ConsoleResourceIndicators/SystemBrowser.cs
@@ -1,4 +1,4 @@
-using Duende.IdentityModel.OidcClient.Browser;
+using IdentityModel.OidcClient.Browser;
 using System;
 using System.Diagnostics;
 using System.Net;