diff --git a/Directory.Packages.props b/Directory.Packages.props
index 70be56dc8..0da8b6d25 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -2,8 +2,8 @@
 
 	<ItemGroup>
 		<PackageVersion Include="AngleSharp" Version="1.1.2" />
-		<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0" />
-		<PackageVersion Include="Aspire.Hosting.Testing" Version="9.0.0" />
+		<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.2.1" />
+		<PackageVersion Include="Aspire.Hosting.Testing" Version="9.2.1" />
 		<PackageVersion Include="BullsEye" Version="5.0.0" />
 		<PackageVersion Include="coverlet.collector" Version="6.0.2" />
 		<PackageVersion Include="Duende.AccessTokenManagement" Version="3.2.0" />
diff --git a/bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj b/bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj
index 974278ebf..cdc7db3c3 100644
--- a/bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj
+++ b/bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.2.1" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
diff --git a/identity-server/aspire/AppHost/AppHost.csproj b/identity-server/aspire/AppHost/AppHost.csproj
new file mode 100644
index 000000000..310bc424b
--- /dev/null
+++ b/identity-server/aspire/AppHost/AppHost.csproj
@@ -0,0 +1,71 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.2.1" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsAspireHost>true</IsAspireHost>
+    <UserSecretsId>b86a3528-3d86-4514-b57f-9839f472ef31</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
+    <PackageReference Include="Aspire.Hosting.SqlServer" Version="9.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+
+    <!-- Database Projects -->
+    <ProjectReference Include="..\..\migrations\AspNetIdentityDb\AspNetIdentityDb.csproj" />
+    <ProjectReference Include="..\..\migrations\IdentityServerDb\IdentityServerDb.csproj" />
+
+    <!-- IdentityServer Hosts -->
+    <ProjectReference Include="..\..\hosts\AspNetIdentity\Host.AspNetIdentity.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\hosts\Configuration\Host.Configuration.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\hosts\EntityFramework\Host.EntityFramework.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\hosts\EntityFramework-dotnet9\Host.EntityFramework.dotnet9.csproj" />
+    <ProjectReference Include="..\..\hosts\main\Host.Main.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
+
+    <!-- API Projects -->
+    <ProjectReference Include="..\..\clients\src\APIs\DPoPApi\DPoPApi.csproj" />
+    <ProjectReference Include="..\..\clients\src\APIs\ResourceBasedApi\ResourceBasedApi.csproj" />
+    <ProjectReference Include="..\..\clients\src\APIs\SimpleApi\SimpleApi.csproj" />
+
+    <!-- Clients (Console) -->
+    <ProjectReference Include="..\..\clients\src\ConsoleCibaClient\ConsoleCibaClient.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleDeviceFlow\ConsoleDeviceFlow.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleClientCredentialsFlow\ConsoleClientCredentialsFlow.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleClientCredentialsFlowCallingIdentityServerApi\ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleClientCredentialsFlowPostBody\ConsoleClientCredentialsFlowPostBody.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleClientCredentialsFlowDPoP\ConsoleClientCredentialsFlowDPoP.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleDcrClient\ConsoleDcrClient.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleEphemeralMtlsClient\ConsoleEphemeralMtlsClient.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleCustomGrant\ConsoleExtensionGrant.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleIntrospectionClient\ConsoleIntrospectionClient.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleMTLSClient\ConsoleMTLSClient.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsolePrivateKeyJwtClient\ConsolePrivateKeyJwtClient.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleResourceOwnerFlow\ConsoleResourceOwnerFlow.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleResourceOwnerFlowPublic\ConsoleResourceOwnerFlowPublic.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleResourceOwnerFlowReference\ConsoleResourceOwnerFlowReference.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleResourceOwnerFlowRefreshToken\ConsoleResourceOwnerFlowRefreshToken.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleResourceOwnerFlowUserInfo\ConsoleResourceOwnerFlowUserInfo.csproj" />
+    <ProjectReference Include="..\..\clients\src\WindowsConsoleSystemBrowser\WindowsConsoleSystemBrowser.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleScopesResources\ConsoleScopesResources.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleCode\ConsoleCode.csproj" />
+    <ProjectReference Include="..\..\clients\src\ConsoleResourceIndicators\ConsoleResourceIndicators.csproj" />
+
+    <!-- Clients (Web) -->
+    <ProjectReference Include="..\..\clients\src\MvcCode\MvcCode.csproj" />
+    <ProjectReference Include="..\..\clients\src\MvcDPoP\MvcDPoP.csproj" />
+    <ProjectReference Include="..\..\clients\src\JsOidc\JsOidc.csproj" />
+    <ProjectReference Include="..\..\clients\src\MvcAutomaticTokenManagement\MvcAutomaticTokenManagement.csproj" />
+    <ProjectReference Include="..\..\clients\src\MvcHybridBackChannel\MvcHybridBackChannel.csproj" />
+    <ProjectReference Include="..\..\clients\src\MvcJarJwt\MvcJarJwt.csproj" />
+    <ProjectReference Include="..\..\clients\src\MvcJarUriJwt\MvcJarUriJwt.csproj" />
+
+  </ItemGroup>
+
+</Project>
diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/Program.cs b/identity-server/aspire/AppHost/Program.cs
similarity index 100%
rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/Program.cs
rename to identity-server/aspire/AppHost/Program.cs
diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/Properties/launchSettings.json b/identity-server/aspire/AppHost/Properties/launchSettings.json
similarity index 100%
rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/Properties/launchSettings.json
rename to identity-server/aspire/AppHost/Properties/launchSettings.json
diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/ResourceBuilderExtensions.cs b/identity-server/aspire/AppHost/ResourceBuilderExtensions.cs
similarity index 100%
rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/ResourceBuilderExtensions.cs
rename to identity-server/aspire/AppHost/ResourceBuilderExtensions.cs
diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/appsettings.Development.json b/identity-server/aspire/AppHost/appsettings.Development.json
similarity index 100%
rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/appsettings.Development.json
rename to identity-server/aspire/AppHost/appsettings.Development.json
diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/appsettings.json b/identity-server/aspire/AppHost/appsettings.json
similarity index 100%
rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/appsettings.json
rename to identity-server/aspire/AppHost/appsettings.json
diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.v3.ncrunchproject b/identity-server/aspire/AppHost/aspire.orchestrator.AppHost.v3.ncrunchproject
similarity index 100%
rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.v3.ncrunchproject
rename to identity-server/aspire/AppHost/aspire.orchestrator.AppHost.v3.ncrunchproject
diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.ServiceDefaults/Extensions.cs b/identity-server/aspire/ServiceDefaults/Extensions.cs
similarity index 100%
rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.ServiceDefaults/Extensions.cs
rename to identity-server/aspire/ServiceDefaults/Extensions.cs
diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.ServiceDefaults/aspire.orchestrator.ServiceDefaults.csproj b/identity-server/aspire/ServiceDefaults/ServiceDefaults.csproj
similarity index 91%
rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.ServiceDefaults/aspire.orchestrator.ServiceDefaults.csproj
rename to identity-server/aspire/ServiceDefaults/ServiceDefaults.csproj
index 99b4c2872..31a1c2346 100644
--- a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.ServiceDefaults/aspire.orchestrator.ServiceDefaults.csproj
+++ b/identity-server/aspire/ServiceDefaults/ServiceDefaults.csproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\IdentityServer\Duende.IdentityServer.csproj" />
+    <ProjectReference Include="..\..\src\IdentityServer\Duende.IdentityServer.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.csproj b/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.csproj
deleted file mode 100644
index 315ea207d..000000000
--- a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.csproj
+++ /dev/null
@@ -1,71 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.1.0" />
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <IsAspireHost>true</IsAspireHost>
-    <UserSecretsId>b86a3528-3d86-4514-b57f-9839f472ef31</UserSecretsId>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
-    <PackageReference Include="Aspire.Hosting.SqlServer" Version="9.1.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-
-    <!-- Database Projects -->
-    <ProjectReference Include="..\..\..\hosts\EntityFramework-dotnet9\Host.EntityFramework.dotnet9.csproj" />
-    <ProjectReference Include="..\..\..\migrations\AspNetIdentityDb\AspNetIdentityDb.csproj" />
-    <ProjectReference Include="..\..\..\migrations\IdentityServerDb\IdentityServerDb.csproj" />
-
-    <!-- IdentityServer Hosts -->
-    <ProjectReference Include="..\..\..\hosts\AspNetIdentity\Host.AspNetIdentity.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\..\..\hosts\Configuration\Host.Configuration.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\..\..\hosts\EntityFramework\Host.EntityFramework.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\..\..\hosts\main\Host.Main.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
-
-    <!-- API Projects -->
-    <ProjectReference Include="..\..\..\clients\src\APIs\DPoPApi\DPoPApi.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\APIs\ResourceBasedApi\ResourceBasedApi.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\APIs\SimpleApi\SimpleApi.csproj" />
-
-    <!-- Clients (Console) -->
-    <ProjectReference Include="..\..\..\clients\src\ConsoleCibaClient\ConsoleCibaClient.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleDeviceFlow\ConsoleDeviceFlow.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleClientCredentialsFlow\ConsoleClientCredentialsFlow.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleClientCredentialsFlowCallingIdentityServerApi\ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleClientCredentialsFlowPostBody\ConsoleClientCredentialsFlowPostBody.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleClientCredentialsFlowDPoP\ConsoleClientCredentialsFlowDPoP.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleDcrClient\ConsoleDcrClient.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleEphemeralMtlsClient\ConsoleEphemeralMtlsClient.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleCustomGrant\ConsoleExtensionGrant.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleIntrospectionClient\ConsoleIntrospectionClient.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleMTLSClient\ConsoleMTLSClient.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsolePrivateKeyJwtClient\ConsolePrivateKeyJwtClient.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleResourceOwnerFlow\ConsoleResourceOwnerFlow.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleResourceOwnerFlowPublic\ConsoleResourceOwnerFlowPublic.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleResourceOwnerFlowReference\ConsoleResourceOwnerFlowReference.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleResourceOwnerFlowRefreshToken\ConsoleResourceOwnerFlowRefreshToken.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleResourceOwnerFlowUserInfo\ConsoleResourceOwnerFlowUserInfo.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\WindowsConsoleSystemBrowser\WindowsConsoleSystemBrowser.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleScopesResources\ConsoleScopesResources.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleCode\ConsoleCode.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\ConsoleResourceIndicators\ConsoleResourceIndicators.csproj" />
-
-    <!-- Clients (Web) -->
-    <ProjectReference Include="..\..\..\clients\src\MvcCode\MvcCode.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\MvcDPoP\MvcDPoP.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\JsOidc\JsOidc.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\MvcAutomaticTokenManagement\MvcAutomaticTokenManagement.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\MvcHybridBackChannel\MvcHybridBackChannel.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\MvcJarJwt\MvcJarJwt.csproj" />
-    <ProjectReference Include="..\..\..\clients\src\MvcJarUriJwt\MvcJarUriJwt.csproj" />
-
-  </ItemGroup>
-
-</Project>
diff --git a/identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj b/identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj
index 80858b8ac..46b57ed28 100644
--- a/identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj
+++ b/identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj b/identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj
index fd28243b7..6914177d0 100644
--- a/identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj
+++ b/identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj b/identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj
index 80858b8ac..46b57ed28 100644
--- a/identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj
+++ b/identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj b/identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj
index fdad3b6bf..428619194 100644
--- a/identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj
+++ b/identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj b/identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj
index 4e8eecb76..91fb619ec 100644
--- a/identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj
+++ b/identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj b/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj
index 4794f1e67..e7159a91c 100644
--- a/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj
+++ b/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj b/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj
index 3f079e01b..9c4b63984 100644
--- a/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj
+++ b/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj b/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj
index f11f722f2..dfa10d102 100644
--- a/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj
+++ b/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 </Project>
diff --git a/identity-server/clients/src/ConsoleCode/ConsoleCode.csproj b/identity-server/clients/src/ConsoleCode/ConsoleCode.csproj
index 5602ce096..115c778cf 100644
--- a/identity-server/clients/src/ConsoleCode/ConsoleCode.csproj
+++ b/identity-server/clients/src/ConsoleCode/ConsoleCode.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+    <ProjectReference Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 </Project>
diff --git a/identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj b/identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj
index 4794f1e67..e7159a91c 100644
--- a/identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj
+++ b/identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj b/identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj
index 53f017a50..87faedb8d 100644
--- a/identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj
+++ b/identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <ProjectReference
-            Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+            Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
         <ProjectReference Include="..\Constants\Constants.csproj" />
     </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj b/identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj
index 4794f1e67..e7159a91c 100644
--- a/identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj
+++ b/identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj b/identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj
index 711034e35..1991e823f 100644
--- a/identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj
+++ b/identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj b/identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj
index 4794f1e67..e7159a91c 100644
--- a/identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj
+++ b/identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj b/identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj
index 6b3c31146..fe94b0f4f 100644
--- a/identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj
+++ b/identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj b/identity-server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj
index 0827cb0b0..d19de5f98 100644
--- a/identity-server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj
+++ b/identity-server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj b/identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj
index f2c886d7f..159ec844b 100644
--- a/identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj
+++ b/identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj b/identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj
index 5602ce096..115c778cf 100644
--- a/identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj
+++ b/identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+    <ProjectReference Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 </Project>
diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj
index 4794f1e67..e7159a91c 100644
--- a/identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj
+++ b/identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj
index 4794f1e67..e7159a91c 100644
--- a/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj
+++ b/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj
index 4794f1e67..e7159a91c 100644
--- a/identity-server/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj
+++ b/identity-server/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj
index 4794f1e67..e7159a91c 100644
--- a/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj
+++ b/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj
index 4794f1e67..e7159a91c 100644
--- a/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj
+++ b/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj b/identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj
index 739a7074c..8ef2ce85e 100644
--- a/identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj
+++ b/identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+    <ProjectReference Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/JsOidc/JsOidc.csproj b/identity-server/clients/src/JsOidc/JsOidc.csproj
index df8b1e26a..a375a6a27 100644
--- a/identity-server/clients/src/JsOidc/JsOidc.csproj
+++ b/identity-server/clients/src/JsOidc/JsOidc.csproj
@@ -6,6 +6,6 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
   </ItemGroup>
 </Project>
diff --git a/identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj b/identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj
index 4a49206b4..428a9e09a 100644
--- a/identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj
+++ b/identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/MvcCode/MvcCode.csproj b/identity-server/clients/src/MvcCode/MvcCode.csproj
index 71bb48c70..3d9ece70b 100644
--- a/identity-server/clients/src/MvcCode/MvcCode.csproj
+++ b/identity-server/clients/src/MvcCode/MvcCode.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
     <PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" />
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
 
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
diff --git a/identity-server/clients/src/MvcDPoP/MvcDPoP.csproj b/identity-server/clients/src/MvcDPoP/MvcDPoP.csproj
index b32cf948d..603a76b7b 100644
--- a/identity-server/clients/src/MvcDPoP/MvcDPoP.csproj
+++ b/identity-server/clients/src/MvcDPoP/MvcDPoP.csproj
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj b/identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj
index cbc5f20d6..bc533f2cc 100644
--- a/identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj
+++ b/identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
     <PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" />
     <PackageReference Include="Serilog.AspNetCore" />
-    <ProjectReference Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+    <ProjectReference Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 </Project>
diff --git a/identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj b/identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj
index 4a49206b4..428a9e09a 100644
--- a/identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj
+++ b/identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj b/identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj
index 4a49206b4..428a9e09a 100644
--- a/identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj
+++ b/identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/hosts/AspNetIdentity/Host.AspNetIdentity.csproj b/identity-server/hosts/AspNetIdentity/Host.AspNetIdentity.csproj
index 62a264f43..fa60b6992 100644
--- a/identity-server/hosts/AspNetIdentity/Host.AspNetIdentity.csproj
+++ b/identity-server/hosts/AspNetIdentity/Host.AspNetIdentity.csproj
@@ -33,7 +33,7 @@ Microsoft.EntityFrameworkCore.SqlServer that don't have this problem exist). -->
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+		<ProjectReference Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
 		<ProjectReference Include="..\..\src\AspNetIdentity\Duende.IdentityServer.AspNetIdentity.csproj" />
 		<ProjectReference Include="..\..\src\Configuration\Duende.IdentityServer.Configuration.csproj" />
 	</ItemGroup>
diff --git a/identity-server/hosts/Configuration/Host.Configuration.csproj b/identity-server/hosts/Configuration/Host.Configuration.csproj
index b3e3b8ebc..31c4e2820 100644
--- a/identity-server/hosts/Configuration/Host.Configuration.csproj
+++ b/identity-server/hosts/Configuration/Host.Configuration.csproj
@@ -36,7 +36,7 @@
 
 	<ItemGroup>
 		<ProjectReference
-		  Include="..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+		  Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
 		<ProjectReference Include="..\..\src\IdentityServer\Duende.IdentityServer.csproj" />
 		<ProjectReference Include="..\..\src\Configuration\Duende.IdentityServer.Configuration.csproj" />
 	</ItemGroup>
diff --git a/identity-server/hosts/EntityFramework-dotnet9/Host.EntityFramework.dotnet9.csproj b/identity-server/hosts/EntityFramework-dotnet9/Host.EntityFramework.dotnet9.csproj
index d21131a9f..c9ad4ee20 100644
--- a/identity-server/hosts/EntityFramework-dotnet9/Host.EntityFramework.dotnet9.csproj
+++ b/identity-server/hosts/EntityFramework-dotnet9/Host.EntityFramework.dotnet9.csproj
@@ -34,7 +34,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+		<ProjectReference Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
 		<ProjectReference Include="..\..\src\Configuration\Duende.IdentityServer.Configuration.csproj" />
 		<ProjectReference Include="..\..\src\Configuration.EntityFramework\Duende.IdentityServer.Configuration.EntityFramework.csproj" />
 		<ProjectReference Include="..\..\src\EntityFramework\Duende.IdentityServer.EntityFramework.csproj" />
diff --git a/identity-server/hosts/EntityFramework/Host.EntityFramework.csproj b/identity-server/hosts/EntityFramework/Host.EntityFramework.csproj
index 6bd8f03c0..9e9297462 100644
--- a/identity-server/hosts/EntityFramework/Host.EntityFramework.csproj
+++ b/identity-server/hosts/EntityFramework/Host.EntityFramework.csproj
@@ -34,7 +34,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+		<ProjectReference Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
 		<ProjectReference Include="..\..\src\Configuration\Duende.IdentityServer.Configuration.csproj" />
 		<ProjectReference Include="..\..\src\Configuration.EntityFramework\Duende.IdentityServer.Configuration.EntityFramework.csproj" />
 		<ProjectReference Include="..\..\src\EntityFramework\Duende.IdentityServer.EntityFramework.csproj" />
diff --git a/identity-server/hosts/main/Host.Main.csproj b/identity-server/hosts/main/Host.Main.csproj
index 68517641d..0c4bca4b1 100644
--- a/identity-server/hosts/main/Host.Main.csproj
+++ b/identity-server/hosts/main/Host.Main.csproj
@@ -36,7 +36,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+		<ProjectReference Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
 		<ProjectReference Include="..\..\src\Configuration\Duende.IdentityServer.Configuration.csproj" />
 		<ProjectReference Include="..\..\src\IdentityServer\Duende.IdentityServer.csproj" />
 	</ItemGroup>
diff --git a/identity-server/identity-server.slnf b/identity-server/identity-server.slnf
index 56a59b620..396f4021c 100644
--- a/identity-server/identity-server.slnf
+++ b/identity-server/identity-server.slnf
@@ -2,8 +2,8 @@
   "solution": {
     "path": "..\\products.slnx",
     "projects": [
-      "identity-server\\aspire\\aspire.orchestrator\\aspire.orchestrator.AppHost\\aspire.orchestrator.AppHost.csproj",
-      "identity-server\\aspire\\aspire.orchestrator\\aspire.orchestrator.ServiceDefaults\\aspire.orchestrator.ServiceDefaults.csproj",
+      "identity-server\\aspire\\AppHost\\AppHost.csproj",
+      "identity-server\\aspire\\ServiceDefaults\\ServiceDefaults.csproj",
       "identity-server\\clients\\src\\Constants\\Constants.csproj",
       "identity-server\\clients\\src\\APIs\\SimpleApi\\SimpleApi.csproj",
       "identity-server\\clients\\src\\APIs\\ResourceBasedApi\\ResourceBasedApi.csproj",
diff --git a/identity-server/migrations/AspNetIdentityDb/AspNetIdentityDb.csproj b/identity-server/migrations/AspNetIdentityDb/AspNetIdentityDb.csproj
index 59a14d5d5..e0579bd1e 100644
--- a/identity-server/migrations/AspNetIdentityDb/AspNetIdentityDb.csproj
+++ b/identity-server/migrations/AspNetIdentityDb/AspNetIdentityDb.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+    <ProjectReference Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\..\hosts\AspNetIdentity\Host.AspNetIdentity.csproj" />
     <ProjectReference Include="..\..\src\AspNetIdentity\Duende.IdentityServer.AspNetIdentity.csproj" />
   </ItemGroup>
diff --git a/identity-server/migrations/IdentityServerDb/IdentityServerDb.csproj b/identity-server/migrations/IdentityServerDb/IdentityServerDb.csproj
index fc0bd2150..7e88e053e 100644
--- a/identity-server/migrations/IdentityServerDb/IdentityServerDb.csproj
+++ b/identity-server/migrations/IdentityServerDb/IdentityServerDb.csproj
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
+      Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference
       Include="..\..\src\EntityFramework.Storage\Duende.IdentityServer.EntityFramework.Storage.csproj" />
     <ProjectReference Include="..\..\src\IdentityServer\Duende.IdentityServer.csproj" />
diff --git a/products.slnx b/products.slnx
index 1b101b9c1..77188a829 100644
--- a/products.slnx
+++ b/products.slnx
@@ -61,12 +61,12 @@
     <Project Path="bff/test/Hosts.Tests/Hosts.Tests.csproj" />
   </Folder>
   <Folder Name="/identity-server/" />
-  <Folder Name="/identity-server/aspire/">
-    <Project Path="identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.csproj" />
-    <Project Path="identity-server/aspire/aspire.orchestrator/aspire.orchestrator.ServiceDefaults/aspire.orchestrator.ServiceDefaults.csproj" />
+  <Folder Name="/identity-server/aspire/" >
+    <Project Path="identity-server/aspire/AppHost/AppHost.csproj" />
+    <Project Path="identity-server/aspire/ServiceDefaults/ServiceDefaults.csproj" />
   </Folder>
   <Folder Name="/identity-server/clients/" />
-  <Folder Name="/identity-server/clients/src/">
+  <Folder Name="/identity-server/clients/src/" >
     <Project Path="identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj" />
     <Project Path="identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj" />
     <Project Path="identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj" />