diff --git a/src/FilterLists.Api/Dockerfile b/src/FilterLists.Api/Dockerfile
index 2836b2af5..4a0f8eee1 100644
--- a/src/FilterLists.Api/Dockerfile
+++ b/src/FilterLists.Api/Dockerfile
@@ -1,7 +1,3 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
-WORKDIR /app
-EXPOSE 5000
-
 FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /src
 COPY FilterLists.Api/FilterLists.Api.csproj src/FilterLists.Api/
@@ -15,7 +11,8 @@ 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 base AS final
+FROM microsoft/dotnet:2.2-aspnetcore-runtime AS final
 WORKDIR /app
 COPY --from=publish /app .
+EXPOSE 5000
 ENTRYPOINT ["dotnet", "FilterLists.Api.dll"]
diff --git a/src/FilterLists.Web/Dockerfile b/src/FilterLists.Web/Dockerfile
index eef6cfda0..b9da86d17 100644
--- a/src/FilterLists.Web/Dockerfile
+++ b/src/FilterLists.Web/Dockerfile
@@ -1,7 +1,3 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
-WORKDIR /app
-EXPOSE 5001
-
 FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /src
 COPY FilterLists.Web/FilterLists.Web.csproj src/FilterLists.Web/
@@ -13,7 +9,8 @@ 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 base AS final
+FROM microsoft/dotnet:2.2-aspnetcore-runtime AS final
 WORKDIR /app
 COPY --from=publish /app .
+EXPOSE 5001
 ENTRYPOINT ["dotnet", "FilterLists.Web.dll"]