diff --git a/system-apps/app-prop-viewer/webClient/package-lock.json b/system-apps/app-prop-viewer/webClient/package-lock.json
index cfd900a1..fd837df5 100644
--- a/system-apps/app-prop-viewer/webClient/package-lock.json
+++ b/system-apps/app-prop-viewer/webClient/package-lock.json
@@ -27,6 +27,7 @@
         "codelyzer": "~6.0.2",
         "copy-webpack-plugin": "~12.0.2",
         "core-js": "~3.19.0",
+        "cross-env": "^7.0.3",
         "css-loader": "~7.1.1",
         "exports-loader": "~5.0.0",
         "html-loader": "~4.2.0",
@@ -6181,6 +6182,24 @@
         "node": ">=8"
       }
     },
+    "node_modules/cross-env": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.1"
+      },
+      "bin": {
+        "cross-env": "src/bin/cross-env.js",
+        "cross-env-shell": "src/bin/cross-env-shell.js"
+      },
+      "engines": {
+        "node": ">=10.14",
+        "npm": ">=6",
+        "yarn": ">=1"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
diff --git a/system-apps/app-prop-viewer/webClient/package.json b/system-apps/app-prop-viewer/webClient/package.json
index 3b49382f..4022fd82 100644
--- a/system-apps/app-prop-viewer/webClient/package.json
+++ b/system-apps/app-prop-viewer/webClient/package.json
@@ -3,7 +3,7 @@
   "version": "2.0.0",
   "scripts": {
     "start": "webpack --progress --watch",
-    "build": "NODE_OPTIONS=--openssl-legacy-provider webpack --progress",
+    "build": "cross-env NODE_OPTIONS=--openssl-legacy-provider webpack --progress",
     "i18n": "ng-xi18n -p tsconfig.i18n.json --i18nFormat=xlf  --outFile=messages.xlf",
     "lint": "tslint -c tslint.json \"./**/*.ts\""
   },
@@ -27,6 +27,7 @@
     "codelyzer": "~6.0.2",
     "copy-webpack-plugin": "~12.0.2",
     "core-js": "~3.19.0",
+    "cross-env": "^7.0.3",
     "css-loader": "~7.1.1",
     "exports-loader": "~5.0.0",
     "html-loader": "~4.2.0",
diff --git a/virtual-desktop/package.json b/virtual-desktop/package.json
index 6c78cf33..534ec6a1 100644
--- a/virtual-desktop/package.json
+++ b/virtual-desktop/package.json
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "build:externals": "webpack --progress --config webpack.externals.js",
-    "start": "webpack --watch --progress",
+    "start": "ng build --watch",
     "build": "ng build",
     "i18n": "ng-xi18n -p tsconfig.ngx-i18n.json --i18nFormat=xlf  --outFile=messages.xlf && xliffmerge -p xliffmerge.json",
     "lint": "tslint -c tslint.json \"src/**/*.ts\""