diff --git a/Directory.Build.props b/Directory.Build.props
index f7b3371..fc87069 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -6,6 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" Version="1.1.118">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/ApiGateway/Dockerfile b/src/ApiGateway/Dockerfile
index de0ea97..c4a618e 100644
--- a/src/ApiGateway/Dockerfile
+++ b/src/ApiGateway/Dockerfile
@@ -8,7 +8,7 @@ COPY ./Directory.Build.props ./
 # Setup working directory for the project
 COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./building-blocks/
 COPY ./src/ApiGateway/src/ApiGateway.csproj ./src/ApiGateway/src/
-
+COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
 
 # Restore nuget packages
 RUN dotnet restore ./src/ApiGateway/src/ApiGateway.csproj
@@ -16,6 +16,7 @@ RUN dotnet restore ./src/ApiGateway/src/ApiGateway.csproj
 # Copy project files
 COPY ./src/BuildingBlocks ./src/BuildingBlocks/
 COPY ./src/ApiGateway/src  ./src/ApiGateway/src/
+COPY ./src/Aspire/src/ServiceDefaults/  ./src/Aspire/src/ServiceDefaults/
 
 # Build project with Release configuration
 # and no restore, as we did it already
diff --git a/src/Aspire/src/ServiceDefaults/Extensions.cs b/src/Aspire/src/ServiceDefaults/Extensions.cs
index bfc7e71..3f7b69c 100644
--- a/src/Aspire/src/ServiceDefaults/Extensions.cs
+++ b/src/Aspire/src/ServiceDefaults/Extensions.cs
@@ -15,18 +15,18 @@ public static class Extensions
         builder.Services.AddServiceDiscovery();
 
         builder.Services.ConfigureHttpClientDefaults(http =>
-                                                     {
-                                                         http.AddStandardResilienceHandler(options =>
-                                                             {
-                                                                 var timeSpan = TimeSpan.FromMinutes(1);
-                                                                 options.CircuitBreaker.SamplingDuration = timeSpan * 2;
-                                                                 options.TotalRequestTimeout.Timeout = timeSpan * 3;
-                                                                 options.Retry.MaxRetryAttempts = 3;
-                                                             });
+        {
+            http.AddStandardResilienceHandler(options =>
+            {
+                var timeSpan = TimeSpan.FromMinutes(1);
+                options.CircuitBreaker.SamplingDuration = timeSpan * 2;
+                options.TotalRequestTimeout.Timeout = timeSpan * 3;
+                options.Retry.MaxRetryAttempts = 3;
+            });
 
-                                                         // Turn on service discovery by default
-                                                         http.AddServiceDiscovery();
-                                                     });
+            // Turn on service discovery by default
+            http.AddServiceDiscovery();
+        });
 
         return builder;
     }
@@ -38,4 +38,4 @@ public static class Extensions
 
         return app;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj b/src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj
index fb9e6be..eb515ac 100644
--- a/src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj
+++ b/src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
+    <ProjectReference Include="..\..\..\BuildingBlocks\BuildingBlocks.csproj" IsAspireProjectResource="false" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Services/Booking/Dockerfile b/src/Services/Booking/Dockerfile
index 393701f..deb7cfa 100644
--- a/src/Services/Booking/Dockerfile
+++ b/src/Services/Booking/Dockerfile
@@ -9,7 +9,7 @@ COPY ./Directory.Build.props ./
 COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./src/BuildingBlocks/
 COPY ./src/Services/Booking/src/Booking/Booking.csproj ./src/Services/Booking/src/Booking/
 COPY ./src/Services/Booking/src/Booking.Api/Booking.Api.csproj ./src/Services/Booking/src/Booking.Api/
-
+COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
 
 # Restore nuget packages
 RUN  dotnet restore ./src/Services/Booking/src/Booking.Api/Booking.Api.csproj
@@ -18,6 +18,7 @@ RUN  dotnet restore ./src/Services/Booking/src/Booking.Api/Booking.Api.csproj
 COPY ./src/BuildingBlocks ./src/BuildingBlocks/
 COPY ./src/Services/Booking/src/Booking/  ./src/Services/Booking/src/Booking/
 COPY ./src/Services/Booking/src/Booking.Api/  ./src/Services/Booking/src/Booking.Api/
+COPY ./src/Aspire/src/ServiceDefaults/  ./src/Aspire/src/ServiceDefaults/
 
 # Build project with Release configuration
 # and no restore, as we did it already
diff --git a/src/Services/Booking/dev.Dockerfile b/src/Services/Booking/dev.Dockerfile
index d1d5c6e..e39c890 100644
--- a/src/Services/Booking/dev.Dockerfile
+++ b/src/Services/Booking/dev.Dockerfile
@@ -9,7 +9,7 @@ COPY ./Directory.Build.props ./
 COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./src/BuildingBlocks/
 COPY ./src/Services/Booking/src/Booking/Booking.csproj ./src/Services/Booking/src/Booking/
 COPY ./src/Services/Booking/src/Booking.Api/Booking.Api.csproj ./src/Services/Booking/src/Booking.Api/
-
+COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
 
 # Restore nuget packages
 RUN --mount=type=cache,id=booking_nuget,target=/root/.nuget/packages \
@@ -19,6 +19,7 @@ RUN --mount=type=cache,id=booking_nuget,target=/root/.nuget/packages \
 COPY ./src/BuildingBlocks ./src/BuildingBlocks/
 COPY ./src/Services/Booking/src/Booking/  ./src/Services/Booking/src/Booking/
 COPY ./src/Services/Booking/src/Booking.Api/  ./src/Services/Booking/src/Booking.Api/
+COPY ./src/Aspire/src/ServiceDefaults/  ./src/Aspire/src/ServiceDefaults/
 
 # Build project with Release configuration
 # and no restore, as we did it already
diff --git a/src/Services/Flight/Dockerfile b/src/Services/Flight/Dockerfile
index 9c5c6ac..73cac02 100644
--- a/src/Services/Flight/Dockerfile
+++ b/src/Services/Flight/Dockerfile
@@ -9,7 +9,7 @@ COPY ./Directory.Build.props ./
 COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./src/BuildingBlocks/
 COPY ./src/Services/Flight/src/Flight/Flight.csproj ./src/Services/Flight/src/Flight/
 COPY ./src/Services/Flight/src/Flight.Api/Flight.Api.csproj ./src/Services/Flight/src/Flight.Api/
-
+COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
 
 # Restore nuget packages
 RUN dotnet restore ./src/Services/Flight/src/Flight.Api/Flight.Api.csproj
@@ -18,6 +18,7 @@ RUN dotnet restore ./src/Services/Flight/src/Flight.Api/Flight.Api.csproj
 COPY ./src/BuildingBlocks ./src/BuildingBlocks/
 COPY ./src/Services/Flight/src/Flight/  ./src/Services/Flight/src/Flight/
 COPY ./src/Services/Flight/src/Flight.Api/  ./src/Services/Flight/src/Flight.Api/
+COPY ./src/Aspire/src/ServiceDefaults/  ./src/Aspire/src/ServiceDefaults/
 
 # Build project with Release configuration
 # and no restore, as we did it already
diff --git a/src/Services/Flight/dev.Dockerfile b/src/Services/Flight/dev.Dockerfile
index 15b748d..467d9af 100644
--- a/src/Services/Flight/dev.Dockerfile
+++ b/src/Services/Flight/dev.Dockerfile
@@ -9,7 +9,7 @@ COPY ./Directory.Build.props ./
 COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./src/BuildingBlocks/
 COPY ./src/Services/Flight/src/Flight/Flight.csproj ./src/Services/Flight/src/Flight/
 COPY ./src/Services/Flight/src/Flight.Api/Flight.Api.csproj ./src/Services/Flight/src/Flight.Api/
-
+COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
 
 # Restore nuget packages
 RUN --mount=type=cache,id=flight_nuget,target=/root/.nuget/packages \
@@ -19,6 +19,7 @@ RUN --mount=type=cache,id=flight_nuget,target=/root/.nuget/packages \
 COPY ./src/BuildingBlocks ./src/BuildingBlocks/
 COPY ./src/Services/Flight/src/Flight/  ./src/Services/Flight/src/Flight/
 COPY ./src/Services/Flight/src/Flight.Api/  ./src/Services/Flight/src/Flight.Api/
+COPY ./src/Aspire/src/ServiceDefaults/  ./src/Aspire/src/ServiceDefaults/
 
 # Build project with Release configuration
 # and no restore, as we did it already
diff --git a/src/Services/Identity/Dockerfile b/src/Services/Identity/Dockerfile
index 5348a23..236af34 100644
--- a/src/Services/Identity/Dockerfile
+++ b/src/Services/Identity/Dockerfile
@@ -10,6 +10,7 @@ COPY ./Directory.Build.props ./
 COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./src/BuildingBlocks/
 COPY ./src/Services/Identity/src/Identity/Identity.csproj ./src/Services/Identity/src/Identity/
 COPY ./src/Services/Identity/src/Identity.Api/Identity.Api.csproj ./src/Services/Identity/src/Identity.Api/
+COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
 
 # Restore nuget packages
 RUN dotnet restore ./src/Services/Identity/src/Identity.Api/Identity.Api.csproj
@@ -18,6 +19,7 @@ RUN dotnet restore ./src/Services/Identity/src/Identity.Api/Identity.Api.csproj
 COPY ./src/BuildingBlocks ./src/BuildingBlocks/
 COPY ./src/Services/Identity/src/Identity/  ./src/Services/Identity/src/Identity/
 COPY ./src/Services/Identity/src/Identity.Api/  ./src/Services/Identity/src/Identity.Api/
+COPY ./src/Aspire/src/ServiceDefaults/  ./src/Aspire/src/ServiceDefaults/
 
 # Build project with Release configuration
 # and no restore, as we did it already
diff --git a/src/Services/Identity/dev.Dockerfile b/src/Services/Identity/dev.Dockerfile
index 9130d3e..778838b 100644
--- a/src/Services/Identity/dev.Dockerfile
+++ b/src/Services/Identity/dev.Dockerfile
@@ -10,6 +10,7 @@ COPY ./Directory.Build.props ./
 COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./src/BuildingBlocks/
 COPY ./src/Services/Identity/src/Identity/Identity.csproj ./src/Services/Identity/src/Identity/
 COPY ./src/Services/Identity/src/Identity.Api/Identity.Api.csproj ./src/Services/Identity/src/Identity.Api/
+COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
 
 # Restore nuget packages
 RUN --mount=type=cache,id=identity_nuget,target=/root/.nuget/packages \
@@ -19,6 +20,7 @@ RUN --mount=type=cache,id=identity_nuget,target=/root/.nuget/packages \
 COPY ./src/BuildingBlocks ./src/BuildingBlocks/
 COPY ./src/Services/Identity/src/Identity/  ./src/Services/Identity/src/Identity/
 COPY ./src/Services/Identity/src/Identity.Api/  ./src/Services/Identity/src/Identity.Api/
+COPY ./src/Aspire/src/ServiceDefaults/  ./src/Aspire/src/ServiceDefaults/
 
 # Build project with Release configuration
 # and no restore, as we did it already
diff --git a/src/Services/Identity/src/Identity/Identity.csproj b/src/Services/Identity/src/Identity/Identity.csproj
index 8431a9f..c5ba9ed 100644
--- a/src/Services/Identity/src/Identity/Identity.csproj
+++ b/src/Services/Identity/src/Identity/Identity.csproj
@@ -7,10 +7,6 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Data\Migrations" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Aspire\src\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
diff --git a/src/Services/Passenger/Dockerfile b/src/Services/Passenger/Dockerfile
index 3bec1ec..cbaa44d 100644
--- a/src/Services/Passenger/Dockerfile
+++ b/src/Services/Passenger/Dockerfile
@@ -9,7 +9,7 @@ COPY ./Directory.Build.props ./
 COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./src/BuildingBlocks/
 COPY ./src/Services/Passenger/src/Passenger/Passenger.csproj ./src/Services/Passenger/src/Passenger/
 COPY ./src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj ./src/Services/Passenger/src/Passenger.Api/
-
+COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
 
 # Restore nuget packages
 RUN dotnet restore ./src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj
@@ -18,6 +18,7 @@ RUN dotnet restore ./src/Services/Passenger/src/Passenger.Api/Passenger.Api.cspr
 COPY ./src/BuildingBlocks ./src/BuildingBlocks/
 COPY ./src/Services/Passenger/src/Passenger/  ./src/Services/Passenger/src/Passenger/
 COPY ./src/Services/Passenger/src/Passenger.Api/  ./src/Services/Passenger/src/Passenger.Api/
+COPY ./src/Aspire/src/ServiceDefaults/  ./src/Aspire/src/ServiceDefaults/
 
 # Build project with Release configuration
 # and no restore, as we did it already
diff --git a/src/Services/Passenger/dev.Dockerfile b/src/Services/Passenger/dev.Dockerfile
index 3aa965c..1f11ecf 100644
--- a/src/Services/Passenger/dev.Dockerfile
+++ b/src/Services/Passenger/dev.Dockerfile
@@ -9,7 +9,7 @@ COPY ./Directory.Build.props ./
 COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./src/BuildingBlocks/
 COPY ./src/Services/Passenger/src/Passenger/Passenger.csproj ./src/Services/Passenger/src/Passenger/
 COPY ./src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj ./src/Services/Passenger/src/Passenger.Api/
-
+COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
 
 # Restore nuget packages
 RUN --mount=type=cache,id=passenger_nuget,target=/root/.nuget/packages \
@@ -19,6 +19,7 @@ RUN --mount=type=cache,id=passenger_nuget,target=/root/.nuget/packages \
 COPY ./src/BuildingBlocks ./src/BuildingBlocks/
 COPY ./src/Services/Passenger/src/Passenger/  ./src/Services/Passenger/src/Passenger/
 COPY ./src/Services/Passenger/src/Passenger.Api/  ./src/Services/Passenger/src/Passenger.Api/
+COPY ./src/Aspire/src/ServiceDefaults/  ./src/Aspire/src/ServiceDefaults/
 
 # Build project with Release configuration
 # and no restore, as we did it already