diff --git a/.dockerignore b/.dockerignore
index 866711f..ed82158 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,6 @@
 .vs
 .vscode
+.git
 node_modules
 bin
 obj
diff --git a/Dockerfile b/Dockerfile
index d0f542a..e36782b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,25 @@
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 
-# Copy everything
-COPY . ./
+COPY tools/Build/ tools/Build/
+WORKDIR /tools/Build
+RUN dotnet build
 
-RUN dotnet run --project ./tools/Build/Build.csproj deployment-package
+WORKDIR /
+COPY src/**/*.csproj src/
+COPY *.sln /
+RUN dotnet run --project ./tools/Build/Build.csproj restore
+
+COPY src/. src/
+RUN dotnet run --project ./tools/Build/Build.csproj build --skip restore
+
+RUN dotnet run --project ./tools/Build/Build.csproj test --skip build
+
+RUN dotnet run --project ./tools/Build/Build.csproj deployment-package --skip test
 
 # Build runtime image
 FROM mcr.microsoft.com/dotnet/aspnet:8.0
+EXPOSE 8080
+WORKDIR /app
 COPY --from=build-env /artifacts .
-ENTRYPOINT ["dotnet", "Twain.Web.dll"]
\ No newline at end of file
+
+ENTRYPOINT ["./app"]
\ No newline at end of file