diff --git a/Dockerfile-scripts/restore-packages b/scripts/restore-packages
similarity index 100%
rename from Dockerfile-scripts/restore-packages
rename to scripts/restore-packages
diff --git a/src/ApiGateways/ApiGw-Base/Dockerfile b/src/ApiGateways/ApiGw-Base/Dockerfile
index 7404c463c..f4751f2d1 100644
--- a/src/ApiGateways/ApiGw-Base/Dockerfile
+++ b/src/ApiGateways/ApiGw-Base/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/ApiGateways/ApiGw-Base/
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
index abbf252a7..d29c73b3e 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
index a816091c3..8ac850778 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/ApiGateways/Web.Bff.Shopping/aggregator
diff --git a/src/Services/Basket/Basket.API/Dockerfile b/src/Services/Basket/Basket.API/Dockerfile
index 1126ab876..81955e178 100644
--- a/src/Services/Basket/Basket.API/Dockerfile
+++ b/src/Services/Basket/Basket.API/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/Services/Basket/Basket.API
diff --git a/src/Services/Catalog/Catalog.API/Dockerfile b/src/Services/Catalog/Catalog.API/Dockerfile
index 7542719a4..70a97da27 100644
--- a/src/Services/Catalog/Catalog.API/Dockerfile
+++ b/src/Services/Catalog/Catalog.API/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/Services/Catalog/Catalog.API
diff --git a/src/Services/Identity/Identity.API/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile
index e31d0e6f0..ed1502208 100644
--- a/src/Services/Identity/Identity.API/Dockerfile
+++ b/src/Services/Identity/Identity.API/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/Services/Identity/Identity.API
diff --git a/src/Services/Location/Locations.API/Dockerfile b/src/Services/Location/Locations.API/Dockerfile
index 4bbde3400..5f5a0c88a 100644
--- a/src/Services/Location/Locations.API/Dockerfile
+++ b/src/Services/Location/Locations.API/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/Services/Location/Locations.API
diff --git a/src/Services/Marketing/Marketing.API/Dockerfile b/src/Services/Marketing/Marketing.API/Dockerfile
index e4e084690..bd9e3807b 100644
--- a/src/Services/Marketing/Marketing.API/Dockerfile
+++ b/src/Services/Marketing/Marketing.API/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/Services/Marketing/Marketing.API
diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile
index 7093a8f56..aa1f0e9c6 100644
--- a/src/Services/Ordering/Ordering.API/Dockerfile
+++ b/src/Services/Ordering/Ordering.API/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/Services/Ordering/Ordering.API
diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
index a780d6589..0c121f4a8 100644
--- a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
+++ b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/Services/Ordering/Ordering.BackgroundTasks
diff --git a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile
index c40b926dc..a40dc797f 100644
--- a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile
+++ b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/Services/Ordering/Ordering.SignalrHub
diff --git a/src/Services/Payment/Payment.API/Dockerfile b/src/Services/Payment/Payment.API/Dockerfile
index a3c2ec684..dcaf9b5e8 100644
--- a/src/Services/Payment/Payment.API/Dockerfile
+++ b/src/Services/Payment/Payment.API/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/Services/Payment/Payment.API
diff --git a/src/Services/Webhooks/Webhooks.API/Dockerfile b/src/Services/Webhooks/Webhooks.API/Dockerfile
index 2c078bffc..0da59affa 100644
--- a/src/Services/Webhooks/Webhooks.API/Dockerfile
+++ b/src/Services/Webhooks/Webhooks.API/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR "/src/src/Services/Webhooks/Webhooks.API"
diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile
index 1a6374223..4cb62e614 100644
--- a/src/Web/WebMVC/Dockerfile
+++ b/src/Web/WebMVC/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/Web/WebMVC
diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile
index 92626c9ba..ef0f46c7f 100644
--- a/src/Web/WebSPA/Dockerfile
+++ b/src/Web/WebSPA/Dockerfile
@@ -12,7 +12,7 @@ RUN npm run build:prod
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -20,7 +20,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 COPY --from=node-build /web/wwwroot /src/src/Web/WebSPA/wwwroot/
diff --git a/src/Web/WebStatus/Dockerfile b/src/Web/WebStatus/Dockerfile
index 7cd6fafb6..edb691988 100644
--- a/src/Web/WebStatus/Dockerfile
+++ b/src/Web/WebStatus/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 80
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/Web/WebStatus
diff --git a/src/Web/WebhookClient/Dockerfile b/src/Web/WebhookClient/Dockerfile
index ba0c223e2..0710db058 100644
--- a/src/Web/WebhookClient/Dockerfile
+++ b/src/Web/WebhookClient/Dockerfile
@@ -6,7 +6,7 @@ EXPOSE 443
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 WORKDIR /src
 
-COPY Dockerfile-scripts Dockerfile-scripts/
+COPY scripts scripts/
 
 COPY src/ApiGateways/*/*.csproj /src/csproj-files/
 COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
@@ -14,7 +14,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
 COPY src/Services/*/*/*.csproj /src/csproj-files/
 COPY src/Web/*/*.csproj /src/csproj-files/
 
-RUN Dockerfile-scripts/restore-packages
+ARG RUN=pwd
+RUN ${RUN}
 
 COPY . .
 WORKDIR /src/src/Web/WebhookClient