diff --git a/src/Web/WebSPA/Client/package.json b/src/Web/WebSPA/Client/package.json
index 0246700af..7c51d3ca2 100644
--- a/src/Web/WebSPA/Client/package.json
+++ b/src/Web/WebSPA/Client/package.json
@@ -19,7 +19,7 @@
     "ng": "ng",
     "rimraf": "rimraf",
     "clean": "npm cache clean && npm run rimraf -- node_modules doc typings coverage wwwroot",
-    "start": "ng serve",
+    "start": "echo Starting... && ng serve",
     "build:dev": "ng build",
     "build:dev:watch": "npm run build:dev && ng build --watch",
     "build:prod": "ng build --prod --aot --extract-css",
diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile
index 00ff8b3b5..c741a7117 100644
--- a/src/Web/WebSPA/Dockerfile
+++ b/src/Web/WebSPA/Dockerfile
@@ -3,6 +3,12 @@
 ARG NODE_IMAGE=node:12.0
 FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
 WORKDIR /app
+RUN apt-get update
+RUN apt-get -y install curl gnupg
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
+RUN apt-get -y install nodejs
+RUN npm install
+RUN npm -v
 EXPOSE 80
 
 FROM ${NODE_IMAGE} as node-build
diff --git a/src/Web/WebSPA/Startup.cs b/src/Web/WebSPA/Startup.cs
index a8812bc94..aa68d9293 100644
--- a/src/Web/WebSPA/Startup.cs
+++ b/src/Web/WebSPA/Startup.cs
@@ -125,7 +125,7 @@ public class Startup
 
             // the root of the angular app. (Where the package.json lives)
             spa.Options.SourcePath = "Client";
-
+            spa.Options.StartupTimeout = new TimeSpan(0, 15, 0);
             if (env.IsDevelopment())
             { 
 
diff --git a/src/docker-compose.override.yml b/src/docker-compose.override.yml
index 8251636e9..8a0d6133b 100644
--- a/src/docker-compose.override.yml
+++ b/src/docker-compose.override.yml
@@ -272,7 +272,7 @@ services:
 
   webspa:
     environment:
-      - ASPNETCORE_ENVIRONMENT=Production
+      - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - PurchaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202