diff --git a/CleanArchitecture.Api/CleanArchitecture.Api.csproj b/CleanArchitecture.Api/CleanArchitecture.Api.csproj
index 60ccd19..7304545 100644
--- a/CleanArchitecture.Api/CleanArchitecture.Api.csproj
+++ b/CleanArchitecture.Api/CleanArchitecture.Api.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <UserSecretsId>64377c40-44d6-4989-9662-5d778f8b3b92</UserSecretsId>
+        <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     </PropertyGroup>
 
     <ItemGroup>
@@ -33,4 +34,10 @@
         <ProjectReference Include="..\CleanArchitecture.Infrastructure\CleanArchitecture.Infrastructure.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Content Include="..\.dockerignore">
+        <Link>.dockerignore</Link>
+      </Content>
+    </ItemGroup>
+
 </Project>
diff --git a/Dockerfile b/Dockerfile
index 7391464..40fb486 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,33 @@
+FROM  --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+USER $APP_UID
+WORKDIR /app
+
 FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG BUILD_CONFIGURATION=Release
 ARG TARGETARCH
-WORKDIR /app
-
-# copy csproj and restore as distinct layers
+WORKDIR /src
+COPY ["CleanArchitecture.Api/CleanArchitecture.Api.csproj", "CleanArchitecture.Api/"]
+COPY ["CleanArchitecture.Application/CleanArchitecture.Application.csproj", "CleanArchitecture.Application/"]
+COPY ["CleanArchitecture.Domain/CleanArchitecture.Domain.csproj", "CleanArchitecture.Domain/"]
+COPY ["CleanArchitecture.Shared/CleanArchitecture.Shared.csproj", "CleanArchitecture.Shared/"]
+COPY ["CleanArchitecture.Proto/CleanArchitecture.Proto.csproj", "CleanArchitecture.Proto/"]
+COPY ["CleanArchitecture.gRPC/CleanArchitecture.gRPC.csproj", "CleanArchitecture.gRPC/"]
+COPY ["CleanArchitecture.Infrastructure/CleanArchitecture.Infrastructure.csproj", "CleanArchitecture.Infrastructure/"]
+RUN dotnet restore "CleanArchitecture.Api/CleanArchitecture.Api.csproj" -a $TARGETARCH
 COPY . .
-RUN dotnet restore -a $TARGETARCH
+WORKDIR "/src/CleanArchitecture.Api"
+RUN dotnet build "CleanArchitecture.Api.csproj" -c $BUILD_CONFIGURATION -o /app/build -a $TARGETARCH
 
-# copy everything else and build app
-COPY CleanArchitecture.Api/. ./CleanArchitecture.Api/
-WORKDIR /app/CleanArchitecture.Api
-RUN dotnet publish -c Release -o out -a $TARGETARCH
-
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
 ARG TARGETARCH
+RUN dotnet publish "CleanArchitecture.Api.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false -a $TARGETARCH
+
+FROM base AS final
 WORKDIR /app
-COPY --from=build /app/CleanArchitecture.Api/out ./
+COPY --from=publish /app/publish .
 
 HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 \
   CMD curl --fail http://localhost/healthz || exit 1
-
 EXPOSE 80
 ENTRYPOINT ["dotnet", "CleanArchitecture.Api.dll"]