diff --git a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/AppHost.cs b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/AppHost.cs
new file mode 100644
index 00000000..38888efa
--- /dev/null
+++ b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/AppHost.cs
@@ -0,0 +1,11 @@
+var builder = DistributedApplication.CreateBuilder(args);
+
+var idp = builder.AddProject<Projects.IdentityServerHost>("identityserverhost");
+
+builder.AddProject<Projects.SimpleApi>("simple-api")
+    .WaitFor(idp);
+
+builder.AddProject<Projects.Client>("client")
+    .WaitFor(idp);
+
+builder.Build().Run();
diff --git a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj
new file mode 100644
index 00000000..32ecfd57
--- /dev/null
+++ b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Aspire.AppHost.Sdk/13.2.2">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.Hosting.AppHost" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../../../IdentityServerHost/src/IdentityServerHost.csproj" />
+    <ProjectReference Include="../../../Apis/SimpleApi/SimpleApi.csproj" />
+    <ProjectReference Include="../src/Client.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/Properties/launchSettings.json b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/Properties/launchSettings.json
new file mode 100644
index 00000000..661b2a42
--- /dev/null
+++ b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/Properties/launchSettings.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:17248;http://localhost:15491",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21175",
+        "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "https://localhost:23176",
+        "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22124"
+      }
+    },
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:15491",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19220",
+        "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:18149",
+        "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20034"
+      }
+    }
+  }
+}
diff --git a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/appsettings.Development.json b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/appsettings.Development.json
new file mode 100644
index 00000000..0c208ae9
--- /dev/null
+++ b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
diff --git a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/appsettings.json b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/appsettings.json
new file mode 100644
index 00000000..31c092aa
--- /dev/null
+++ b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Aspire.Hosting.Dcp": "Warning"
+    }
+  }
+}
diff --git a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
index ec3df387..3c2c6b54 100755
--- a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
+++ b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..\IdentityServerHost\src\IdentityServerHost.csproj", "{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JwtBasedClientAuthentication.AppHost", "JwtBasedClientAuthentication.AppHost\JwtBasedClientAuthentication.AppHost.csproj", "{D257943F-BD65-4E2F-8ECE-266A76B56A64}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,18 +36,6 @@ Global
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x64.Build.0 = Release|Any CPU
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x86.ActiveCfg = Release|Any CPU
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x86.Build.0 = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.Build.0 = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x86.Build.0 = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.ActiveCfg = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.Build.0 = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.ActiveCfg = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.Build.0 = Release|Any CPU
 		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -70,6 +60,18 @@ Global
 		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Release|x64.Build.0 = Release|Any CPU
 		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Release|x86.ActiveCfg = Release|Any CPU
 		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Release|x86.Build.0 = Release|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Debug|x64.Build.0 = Debug|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Debug|x86.Build.0 = Debug|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Release|x64.ActiveCfg = Release|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Release|x64.Build.0 = Release|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Release|x86.ActiveCfg = Release|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection
diff --git a/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/AppHost.cs b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/AppHost.cs
new file mode 100644
index 00000000..38888efa
--- /dev/null
+++ b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/AppHost.cs
@@ -0,0 +1,11 @@
+var builder = DistributedApplication.CreateBuilder(args);
+
+var idp = builder.AddProject<Projects.IdentityServerHost>("identityserverhost");
+
+builder.AddProject<Projects.SimpleApi>("simple-api")
+    .WaitFor(idp);
+
+builder.AddProject<Projects.Client>("client")
+    .WaitFor(idp);
+
+builder.Build().Run();
diff --git a/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj
new file mode 100644
index 00000000..32ecfd57
--- /dev/null
+++ b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Aspire.AppHost.Sdk/13.2.2">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.Hosting.AppHost" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../../../IdentityServerHost/src/IdentityServerHost.csproj" />
+    <ProjectReference Include="../../../Apis/SimpleApi/SimpleApi.csproj" />
+    <ProjectReference Include="../src/Client.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/Properties/launchSettings.json b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/Properties/launchSettings.json
new file mode 100644
index 00000000..03143836
--- /dev/null
+++ b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/Properties/launchSettings.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:17148;http://localhost:15391",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21175",
+        "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "https://localhost:23176",
+        "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22124"
+      }
+    },
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:15391",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19220",
+        "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:18149",
+        "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20034"
+      }
+    }
+  }
+}
diff --git a/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/appsettings.Development.json b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/appsettings.Development.json
new file mode 100644
index 00000000..0c208ae9
--- /dev/null
+++ b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
diff --git a/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/appsettings.json b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/appsettings.json
new file mode 100644
index 00000000..31c092aa
--- /dev/null
+++ b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Aspire.Hosting.Dcp": "Warning"
+    }
+  }
+}
diff --git a/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
index ec3df387..a26c694c 100755
--- a/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
+++ b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..\IdentityServerHost\src\IdentityServerHost.csproj", "{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JwtBasedClientAuthentication.AppHost", "JwtBasedClientAuthentication.AppHost\JwtBasedClientAuthentication.AppHost.csproj", "{D257943F-BD65-4E2F-8ECE-266A76B56A63}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -70,6 +72,18 @@ Global
 		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Release|x64.Build.0 = Release|Any CPU
 		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Release|x86.ActiveCfg = Release|Any CPU
 		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Release|x86.Build.0 = Release|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A63}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A63}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A63}.Debug|x64.Build.0 = Debug|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A63}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A63}.Debug|x86.Build.0 = Debug|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A63}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A63}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A63}.Release|x64.ActiveCfg = Release|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A63}.Release|x64.Build.0 = Release|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A63}.Release|x86.ActiveCfg = Release|Any CPU
+		{D257943F-BD65-4E2F-8ECE-266A76B56A63}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection
diff --git a/samples.slnx b/samples.slnx
index daaf8585..e455363d 100644
--- a/samples.slnx
+++ b/samples.slnx
@@ -205,10 +205,13 @@
     <Project Path="IdentityServer/v7/Basics/ClientCredentials/ClientCredentials.AppHost/ClientCredentials.AppHost.csproj" />
   </Folder>
   <Folder Name="/IdentityServer/v7/Basics/Introspection/">
+    <Project Path="IdentityServer/v7/Basics/Introspection/Introspection.AppHost/Introspection.AppHost.csproj" />
     <Project Path="IdentityServer/v7/Basics/Introspection/src/Client.csproj" />
   </Folder>
   <Folder Name="/IdentityServer/v7/Basics/JwtBasedClientAuthentication/">
+    <File Path="IdentityServer\v7\Basics\JwtBasedClientAuthentication\JwtBasedClientAuthentication.slnx" />
     <Project Path="IdentityServer/v7/Basics/JwtBasedClientAuthentication/src/Client.csproj" />
+    <Project Path="IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj" />
   </Folder>
   <Folder Name="/IdentityServer/v7/Basics/MvcBackChannelLogout/">
     <Project Path="IdentityServer/v7/Basics/MvcBackChannelLogout/src/Client.csproj" />
@@ -427,10 +430,13 @@
     <Project Path="IdentityServer/v8/Basics/ClientCredentials/ClientCredentials.AppHost/ClientCredentials.AppHost.csproj" />
   </Folder>
   <Folder Name="/IdentityServer/v8/Basics/Introspection/">
+    <Project Path="IdentityServer/v8/Basics/Introspection/Introspection.AppHost/Introspection.AppHost.csproj" />
     <Project Path="IdentityServer/v8/Basics/Introspection/src/Client.csproj" />
   </Folder>
   <Folder Name="/IdentityServer/v8/Basics/JwtBasedClientAuthentication/">
+    <File Path="IdentityServer\v8\Basics\JwtBasedClientAuthentication\JwtBasedClientAuthentication.slnx" />
     <Project Path="IdentityServer/v8/Basics/JwtBasedClientAuthentication/src/Client.csproj" />
+    <Project Path="IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj" />
   </Folder>
   <Folder Name="/IdentityServer/v8/Basics/MvcBackChannelLogout/">
     <Project Path="IdentityServer/v8/Basics/MvcBackChannelLogout/src/Client.csproj" />