diff --git a/Notesnook.API/Dockerfile b/Notesnook.API/Dockerfile
index 2de048a..af6387b 100644
--- a/Notesnook.API/Dockerfile
+++ b/Notesnook.API/Dockerfile
@@ -1,28 +1,14 @@
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
-WORKDIR /app
 
-# restore all project dependencies
-COPY Streetwriters.Data/*.csproj ./Streetwriters.Data/
-RUN dotnet restore /app/Streetwriters.Data/Streetwriters.Data.csproj --use-current-runtime
-
-COPY Streetwriters.Common/*.csproj ./Streetwriters.Common/
-RUN dotnet restore /app/Streetwriters.Common/Streetwriters.Common.csproj --use-current-runtime
-
-COPY Notesnook.API/*.csproj ./Notesnook.API/
-RUN dotnet restore /app/Notesnook.API/Notesnook.API.csproj --use-current-runtime
-
-# copy everything else
-COPY Streetwriters.Data/ ./Streetwriters.Data/
-COPY Streetwriters.Common/ ./Streetwriters.Common/
-COPY Notesnook.API/ ./Notesnook.API/
+# # restore all project dependencies
+RUN dotnet restore -v d Notesnook.sln
 
 # build
-WORKDIR /app/Notesnook.API/
 ENV DOTNET_TC_QuickJitForLoops="1" DOTNET_ReadyToRun="0" DOTNET_TieredPGO="1" DOTNET_SYSTEM_GLOBALIZATION_INVARIANT="true"
-RUN dotnet publish -c Release -o /app/out --use-current-runtime --self-contained false --no-restore
+RUN dotnet publish /Notesnook.API/Notesnook.API.csproj -c Release -o /out --use-current-runtime --self-contained false --no-restore
 
 # final stage/image
 FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
-COPY --from=build /app/out .
+COPY --from=build /out .
 ENTRYPOINT ["dotnet", "Notesnook.API.dll"]
\ No newline at end of file
diff --git a/Streetwriters.Identity/Dockerfile b/Streetwriters.Identity/Dockerfile
index 93d5195..4263a07 100644
--- a/Streetwriters.Identity/Dockerfile
+++ b/Streetwriters.Identity/Dockerfile
@@ -1,28 +1,14 @@
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
-WORKDIR /app
 
-# restore all project dependencies
-COPY Streetwriters.Data/*.csproj ./Streetwriters.Data/
-RUN dotnet restore /app/Streetwriters.Data/Streetwriters.Data.csproj --use-current-runtime
-
-COPY Streetwriters.Common/*.csproj ./Streetwriters.Common/
-RUN dotnet restore /app/Streetwriters.Common/Streetwriters.Common.csproj --use-current-runtime
-
-COPY Streetwriters.Identity/*.csproj ./Streetwriters.Identity/
-RUN dotnet restore /app/Streetwriters.Identity/Streetwriters.Identity.csproj --use-current-runtime
-
-# copy everything else
-COPY Streetwriters.Data/ ./Streetwriters.Data/
-COPY Streetwriters.Common/ ./Streetwriters.Common/
-COPY Streetwriters.Identity/ ./Streetwriters.Identity/
+# # restore all project dependencies
+RUN dotnet restore -v d Notesnook.sln
 
 # build
-WORKDIR /app/Streetwriters.Identity/
 ENV DOTNET_TC_QuickJitForLoops="1" DOTNET_ReadyToRun="0" DOTNET_TieredPGO="1" DOTNET_SYSTEM_GLOBALIZATION_INVARIANT="true"
-RUN dotnet publish -c Release -o /app/out --use-current-runtime --self-contained false --no-restore
+RUN dotnet publish /Streetwriters.Identity/Streetwriters.Identity.csproj -c Release -o /out --use-current-runtime --self-contained false --no-restore
 
 # final stage/image
 FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
-COPY --from=build /app/out .
+COPY --from=build /out .
 ENTRYPOINT ["dotnet", "Streetwriters.Identity.dll"]
\ No newline at end of file
diff --git a/Streetwriters.Messenger/Dockerfile b/Streetwriters.Messenger/Dockerfile
index f1ef195..5a47985 100644
--- a/Streetwriters.Messenger/Dockerfile
+++ b/Streetwriters.Messenger/Dockerfile
@@ -1,28 +1,14 @@
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
-WORKDIR /app
 
-# restore all project dependencies
-COPY Streetwriters.Data/*.csproj ./Streetwriters.Data/
-RUN dotnet restore /app/Streetwriters.Data/Streetwriters.Data.csproj --use-current-runtime
-
-COPY Streetwriters.Common/*.csproj ./Streetwriters.Common/
-RUN dotnet restore /app/Streetwriters.Common/Streetwriters.Common.csproj --use-current-runtime
-
-COPY Streetwriters.Messenger/*.csproj ./Streetwriters.Messenger/
-RUN dotnet restore /app/Streetwriters.Messenger/Streetwriters.Messenger.csproj --use-current-runtime
-
-# copy everything else
-COPY Streetwriters.Data/ ./Streetwriters.Data/
-COPY Streetwriters.Common/ ./Streetwriters.Common/
-COPY Streetwriters.Messenger/ ./Streetwriters.Messenger/
+# # restore all project dependencies
+RUN dotnet restore -v d Notesnook.sln
 
 # build
-WORKDIR /app/Streetwriters.Messenger/
 ENV DOTNET_TC_QuickJitForLoops="1" DOTNET_ReadyToRun="0" DOTNET_TieredPGO="1" DOTNET_SYSTEM_GLOBALIZATION_INVARIANT="true"
-RUN dotnet publish -c Release -o /app/out --use-current-runtime --self-contained false --no-restore
+RUN dotnet publish /Streetwriters.Messenger/Streetwriters.Messenger.csproj -c Release -o /out --use-current-runtime --self-contained false --no-restore
 
 # final stage/image
 FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
-COPY --from=build /app/out .
+COPY --from=build /out .
 ENTRYPOINT ["dotnet", "Streetwriters.Messenger.dll"]
\ No newline at end of file