diff --git a/src/FilterLists.Api/Dockerfile b/src/FilterLists.Api/Dockerfile
index 4a0f8eee1..5cd7c0228 100644
--- a/src/FilterLists.Api/Dockerfile
+++ b/src/FilterLists.Api/Dockerfile
@@ -1,18 +1,10 @@
-FROM microsoft/dotnet:2.2-sdk AS build
-WORKDIR /src
-COPY FilterLists.Api/FilterLists.Api.csproj src/FilterLists.Api/
-COPY FilterLists.Services/FilterLists.Services.csproj src/FilterLists.Services/
-COPY FilterLists.Data/FilterLists.Data.csproj src/FilterLists.Data/
-RUN dotnet restore src/FilterLists.Api/FilterLists.Api.csproj
-COPY . .
-WORKDIR FilterLists.Api
-RUN dotnet build FilterLists.Api.csproj -c Release -o /app
-
-FROM build AS publish
-RUN dotnet publish FilterLists.Api.csproj -c Release -o /app
+FROM microsoft/dotnet:2.2-sdk AS publish
+COPY FilterLists.Api /FilterLists.Api
+COPY FilterLists.Data /FilterLists.Data
+COPY FilterLists.Services /FilterLists.Services
+RUN dotnet publish FilterLists.Api/FilterLists.Api.csproj -c Release -o /out
 
 FROM microsoft/dotnet:2.2-aspnetcore-runtime AS final
-WORKDIR /app
-COPY --from=publish /app .
+COPY --from=publish /out .
 EXPOSE 5000
 ENTRYPOINT ["dotnet", "FilterLists.Api.dll"]
diff --git a/src/FilterLists.Web/Dockerfile b/src/FilterLists.Web/Dockerfile
index b9da86d17..948c5bc92 100644
--- a/src/FilterLists.Web/Dockerfile
+++ b/src/FilterLists.Web/Dockerfile
@@ -1,16 +1,8 @@
-FROM microsoft/dotnet:2.2-sdk AS build
-WORKDIR /src
-COPY FilterLists.Web/FilterLists.Web.csproj src/FilterLists.Web/
-RUN dotnet restore src/FilterLists.Web/FilterLists.Web.csproj
-COPY . .
-WORKDIR FilterLists.Web
-RUN dotnet build FilterLists.Web.csproj -c Release -o /app
-
-FROM build AS publish
-RUN dotnet publish FilterLists.Web.csproj -c Release -o /app
+FROM microsoft/dotnet:2.2-sdk AS publish
+COPY FilterLists.Web /FilterLists.Web
+RUN dotnet publish FilterLists.Web/FilterLists.Web.csproj -c Release -o /out
 
 FROM microsoft/dotnet:2.2-aspnetcore-runtime AS final
-WORKDIR /app
-COPY --from=publish /app .
+COPY --from=publish /out .
 EXPOSE 5001
 ENTRYPOINT ["dotnet", "FilterLists.Web.dll"]