diff --git a/.dockerignore b/.dockerignore
index 084da0b..a31b4c9 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -14,33 +14,33 @@
 *.userprefs
 
 # Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
+**/[Dd]ebug/
+**/[Dd]ebugPublic/
+**/[Rr]elease/
+**/[Rr]eleases/
+**/x64/
+**/x86/
+**/bld/
+**/[Bb]in/
+**/[Oo]bj/
+**/[Ll]og/
 
 # Visual Studio 2015 cache/options directory
-.vs/
+**/.vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 
 # MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
+**/[Tt]est[Rr]esult*/
+**/[Bb]uild[Ll]og.*
 
 # NUNIT
 *.VisualState.xml
 TestResult.xml
 
 # Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
+**/[Dd]ebugPS/
+**/[Rr]eleasePS/
 dlldata.c
 
 # DNX
@@ -144,7 +144,7 @@ DocProject/Help/Html2
 DocProject/Help/html
 
 # Click-Once directory
-publish/
+**/publish/
 
 # Publish Web Output
 *.[Pp]ublish.xml
@@ -200,7 +200,7 @@ ClientBin/
 *.jfm
 *.pfx
 *.publishsettings
-node_modules/
+**/node_modules/
 orleans.codegen.cs
 
 # Since there are multiple workflows, uncomment next line to ignore bower_components
diff --git a/Dockerfile.CLI b/Dockerfile.CLI
index c55654f..b5a04fa 100644
--- a/Dockerfile.CLI
+++ b/Dockerfile.CLI
@@ -13,7 +13,7 @@ RUN dotnet restore ./Selector.CLI/Selector.CLI.csproj
 COPY . ./
 
 FROM base as publish
-RUN dotnet publish Selector.CLI/Selector.CLI.csproj -c Release -o /app --no-restore
+RUN dotnet publish Selector.CLI/Selector.CLI.csproj -c Release -o /app
 
 FROM mcr.microsoft.com/dotnet/aspnet:7.0
 WORKDIR /app
diff --git a/Dockerfile.Web b/Dockerfile.Web
index 61893e2..7448352 100644
--- a/Dockerfile.Web
+++ b/Dockerfile.Web
@@ -24,7 +24,7 @@ COPY . ./
 FROM base as publish
 COPY --from=frontend /Selector.Web/wwwroot Selector.Web/wwwroot/
 COPY --from=frontend /Selector.Web/wwwroot Selector.Web/wwwroot/
-RUN dotnet publish Selector.Web/Selector.Web.csproj -c Release -o /app --no-restore
+RUN dotnet publish Selector.Web/Selector.Web.csproj -c Release -o /app
 
 FROM mcr.microsoft.com/dotnet/aspnet:7.0
 EXPOSE 80