diff --git a/Dockerfile b/Dockerfile
index b7cc026..a7c1311 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,8 @@ WORKDIR /src
 COPY . .
 
 # Restore & publish (self-contained trimming can be added later if desired)
-RUN dotnet restore
-RUN dotnet publish -c $BUILD_CONFIGURATION -o /app/publish --no-restore
+RUN dotnet restore SimpleIdp.csproj
+RUN dotnet publish SimpleIdp.csproj -c $BUILD_CONFIGURATION -o /app/publish --no-restore
 
 # =========================
 # Runtime stage
diff --git a/SimpleIdp.csproj b/SimpleIdp.csproj
index a6e580b..fe2b7e9 100644
--- a/SimpleIdp.csproj
+++ b/SimpleIdp.csproj
@@ -4,6 +4,11 @@
 		<OutputType>Exe</OutputType>
 		<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
 	</PropertyGroup>
+	<ItemGroup>
+		<Compile Remove="SimpleIdp.Tests/**" />
+		<EmbeddedResource Remove="SimpleIdp.Tests/**" />
+		<None Remove="SimpleIdp.Tests/**" />
+	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.3.0" />
 		<PackageReference Include="SimpleIdServer.IdServer.Pwd" Version="6.0.*-*" />