diff --git a/src/FilterLists.Api/Dockerfile b/src/FilterLists.Api/Dockerfile
index 8e88a6609..292e59804 100644
--- a/src/FilterLists.Api/Dockerfile
+++ b/src/FilterLists.Api/Dockerfile
@@ -1,3 +1,6 @@
+FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine as base
+WORKDIR /app
+
 FROM microsoft/dotnet:2.2-sdk-alpine AS publish
 WORKDIR /app
 COPY src/FilterLists.Data/FilterLists.Data.csproj ./FilterLists.Data/
@@ -13,7 +16,7 @@ COPY src/FilterLists.Api/. ./FilterLists.Api/
 WORKDIR /app/FilterLists.Api
 RUN dotnet publish -c Release -o /out
 
-FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine
+FROM base
 WORKDIR /app
 COPY --from=publish /out .
 COPY data ./data/
diff --git a/src/FilterLists.Web/Dockerfile b/src/FilterLists.Web/Dockerfile
index 81ff5d7c8..98cd784fc 100644
--- a/src/FilterLists.Web/Dockerfile
+++ b/src/FilterLists.Web/Dockerfile
@@ -1,3 +1,6 @@
+FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine as base
+WORKDIR /app
+
 FROM microsoft/dotnet:2.2-sdk-alpine AS publish
 RUN apk add --update nodejs-npm
 
@@ -8,7 +11,7 @@ RUN dotnet restore
 COPY . .
 RUN dotnet publish -c Release -o /out
 
-FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine
+FROM base
 WORKDIR /app
 COPY --from=publish /out .
 ENV ASPNETCORE_URLS http://+:80