diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9aec66e23..10a683e3e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -228,9 +228,12 @@ jobs:
           at: ~/repo
       # Build & Test
       - run:
-          name: 'Build Demo Site, Upload SourceMaps, Send Deploy Notification'
+          name: 'Build Demo Site'
+          command: yarn run build:demo
+          no_output_timeout: 30m
+      - run:
+          name: 'Upload SourceMaps, Send Deploy Notification'
           command: |
-            npx lerna run build:viewer:demo --stream
             # export FILE_1=$(find ./build/static/js -type f -name "2.*.js" -exec basename {} \;)
             # export FILE_MAIN=$(find ./build/static/js -type f -name "main.*.js" -exec basename {} \;)
             # export FILE_RUNTIME_MAIN=$(find ./build/static/js -type f -name "runtime~main.*.js" -exec basename {} \;)
diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json
index d5b21483e..e3546b5ce 100644
--- a/extensions/cornerstone/package.json
+++ b/extensions/cornerstone/package.json
@@ -20,7 +20,7 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=production webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
     "dev:cornerstone": "yarn run dev",
     "build": "webpack --config .webpack/webpack.prod.js",
     "build:package": "yarn run build",
diff --git a/extensions/dicom-html/package.json b/extensions/dicom-html/package.json
index c511c0c8d..2902d112f 100644
--- a/extensions/dicom-html/package.json
+++ b/extensions/dicom-html/package.json
@@ -20,7 +20,7 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=production webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
     "dev:dicom-html": "yarn run dev",
     "build": "webpack --config .webpack/webpack.prod.js",
     "build:package": "yarn run build",
diff --git a/extensions/dicom-microscopy/package.json b/extensions/dicom-microscopy/package.json
index baf73951e..cb8ce9e98 100644
--- a/extensions/dicom-microscopy/package.json
+++ b/extensions/dicom-microscopy/package.json
@@ -20,9 +20,9 @@
     "yarn": ">=1.16.0"
   },
   "scripts": {
-    "dev": "webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
     "dev:dicom-microscopy": "yarn run dev",
-    "build": "webpack --config .webpack/webpack.prod.js",
+    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
     "build:package": "yarn run build",
     "prepublishOnly": "yarn run build",
     "start": "yarn run dev"
diff --git a/extensions/dicom-pdf/package.json b/extensions/dicom-pdf/package.json
index 4776bd7c2..320ea5679 100644
--- a/extensions/dicom-pdf/package.json
+++ b/extensions/dicom-pdf/package.json
@@ -20,9 +20,9 @@
     "README.md"
   ],
   "scripts": {
-    "dev": "webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
     "dev:dicom-pdf": "yarn run dev",
-    "build": "webpack --config .webpack/webpack.prod.js",
+    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
     "build:package": "yarn run build",
     "prepublishOnly": "yarn run build",
     "start": "yarn run dev"
diff --git a/extensions/vtk/package.json b/extensions/vtk/package.json
index 8ae68c576..cca9b8dba 100644
--- a/extensions/vtk/package.json
+++ b/extensions/vtk/package.json
@@ -21,9 +21,9 @@
     "yarn": ">=1.16.0"
   },
   "scripts": {
-    "dev": "webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
     "dev:dicom-vtk": "yarn run dev",
-    "build": "webpack --config .webpack/webpack.prod.js",
+    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
     "build:package": "yarn run build",
     "prepublishOnly": "yarn run build",
     "start": "yarn run dev"
diff --git a/platform/core/package.json b/platform/core/package.json
index 3ed710d6a..f9727dae4 100644
--- a/platform/core/package.json
+++ b/platform/core/package.json
@@ -23,7 +23,7 @@
   "scripts": {
     "dev": "jest --watchAll",
     "dev:core": "yarn run dev",
-    "build": "webpack --config .webpack/webpack.prod.js",
+    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
     "build:package": "yarn run build",
     "prepublishOnly": "yarn run build",
     "start": "yarn run dev",
diff --git a/platform/i18n/package.json b/platform/i18n/package.json
index ea5ce000d..5f59e87d5 100644
--- a/platform/i18n/package.json
+++ b/platform/i18n/package.json
@@ -20,9 +20,9 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
     "dev:i18n": "yarn run dev",
-    "build": "webpack --config .webpack/webpack.prod.js",
+    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
     "build:package": "yarn run build",
     "prepublishOnly": "yarn run build",
     "pullTranslations": "./pullTranslations.sh",
diff --git a/platform/ui/package.json b/platform/ui/package.json
index 5e43ac936..d3052508e 100644
--- a/platform/ui/package.json
+++ b/platform/ui/package.json
@@ -23,7 +23,7 @@
     "dev": "docz dev",
     "dev:ui": "yarn run dev",
     "docs": "docz build",
-    "build": "webpack --config .webpack/webpack.prod.js",
+    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
     "build:package": "yarn run build",
     "prepublishOnly": "yarn run build",
     "test:unit": "jest --watchAll",