diff --git a/Makefile b/Makefile
index ad0c76e9d2..c84560fa8d 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ endif
 	yarn run electron-builder --publish onTag $(ELECTRON_BUILDER_EXTRA_ARGS)
 
 $(extension_node_modules): node_modules
-	cd $(@:/node_modules=) && ../../node_modules/.bin/npm install --no-audit --no-fund
+	cd $(@:/node_modules=) && ../../node_modules/.bin/npm install --no-audit --no-fund --no-save
 
 $(extension_dists): src/extensions/npm/extensions/dist
 	cd $(@:/dist=) && ../../node_modules/.bin/npm run build
diff --git a/extensions/kube-object-event-status/package.json b/extensions/kube-object-event-status/package.json
index 3fa8cd295a..55dd5a22a6 100644
--- a/extensions/kube-object-event-status/package.json
+++ b/extensions/kube-object-event-status/package.json
@@ -8,8 +8,8 @@
     "styles": []
   },
   "scripts": {
-    "build": "webpack && npm pack",
-    "dev": "webpack --watch",
+    "build": "npx webpack && npm pack",
+    "dev": "npx webpack --watch",
     "test": "echo NO TESTS"
   },
   "files": [
@@ -17,9 +17,6 @@
   ],
   "dependencies": {},
   "devDependencies": {
-    "@k8slens/extensions": "file:../../src/extensions/npm/extensions",
-    "ts-loader": "latest",
-    "typescript": "latest",
-    "webpack": "latest"
+    "@k8slens/extensions": "file:../../src/extensions/npm/extensions"
   }
 }
diff --git a/extensions/metrics-cluster-feature/package.json b/extensions/metrics-cluster-feature/package.json
index fb03380907..7b04c0993b 100644
--- a/extensions/metrics-cluster-feature/package.json
+++ b/extensions/metrics-cluster-feature/package.json
@@ -8,9 +8,9 @@
     "styles": []
   },
   "scripts": {
-    "build": "webpack && npm pack",
-    "dev": "webpack --watch",
-    "test": "jest --passWithNoTests --env=jsdom src $@",
+    "build": "npx webpack && npm pack",
+    "dev": "npx webpack --watch",
+    "test": "npx jest --passWithNoTests --env=jsdom src $@",
     "clean": "rm -rf dist/ && rm *.tgz"
   },
   "files": [
@@ -19,10 +19,6 @@
   ],
   "devDependencies": {
     "@k8slens/extensions": "file:../../src/extensions/npm/extensions",
-    "semver": "^7.3.2",
-    "jest": "latest",
-    "ts-loader": "latest",
-    "typescript": "latest",
-    "webpack": "latest"
+    "semver": "^7.3.2"
   }
 }
diff --git a/extensions/node-menu/package.json b/extensions/node-menu/package.json
index 54efbd6031..1d698f518c 100644
--- a/extensions/node-menu/package.json
+++ b/extensions/node-menu/package.json
@@ -8,19 +8,15 @@
     "styles": []
   },
   "scripts": {
-    "build": "webpack && npm pack",
-    "dev": "webpack --watch",
-    "test": "jest --passWithNoTests --env=jsdom src $@"
+    "build": "npx webpack && npm pack",
+    "dev": "npx webpack --watch",
+    "test": "npx jest --passWithNoTests --env=jsdom src $@"
   },
   "files": [
     "dist/**/*"
   ],
   "dependencies": {},
   "devDependencies": {
-    "@k8slens/extensions": "file:../../src/extensions/npm/extensions",
-    "jest": "latest",
-    "ts-loader": "latest",
-    "typescript": "latest",
-    "webpack": "latest"
+    "@k8slens/extensions": "file:../../src/extensions/npm/extensions"
   }
 }
diff --git a/extensions/pod-menu/package.json b/extensions/pod-menu/package.json
index 7097beb8f6..b32df068f1 100644
--- a/extensions/pod-menu/package.json
+++ b/extensions/pod-menu/package.json
@@ -8,19 +8,15 @@
     "styles": []
   },
   "scripts": {
-    "build": "webpack && npm pack",
-    "dev": "webpack --watch",
-    "test": "jest --passWithNoTests --env=jsdom src $@"
+    "build": "npx webpack && npm pack",
+    "dev": "npx webpack --watch",
+    "test": "npx jest --passWithNoTests --env=jsdom src $@"
   },
   "files": [
     "dist/**/*"
   ],
   "dependencies": {},
   "devDependencies": {
-    "@k8slens/extensions": "file:../../src/extensions/npm/extensions",
-    "jest": "latest",
-    "ts-loader": "latest",
-    "typescript": "latest",
-    "webpack": "latest"
+    "@k8slens/extensions": "file:../../src/extensions/npm/extensions"
   }
 }
diff --git a/src/main/lens-proxy.ts b/src/main/lens-proxy.ts
index fa9d0ff56d..31d593d627 100644
--- a/src/main/lens-proxy.ts
+++ b/src/main/lens-proxy.ts
@@ -79,12 +79,13 @@ export class LensProxy extends Singleton {
 
     this.proxyServer
       .on("upgrade", (req: http.IncomingMessage, socket: net.Socket, head: Buffer) => {
-        console.log("upgrade", req.url);
         const isInternal = req.url.startsWith(`${apiPrefix}?`);
         const cluster = getClusterForRequest(req);
 
         if (!cluster) {
-          return void logger.error(`[LENS-PROXY]: Could not find cluster for upgrade request from url=${req.url}`);
+          logger.error(`[LENS-PROXY]: Could not find cluster for upgrade request from url=${req.url}`);
+          
+          return socket.destroy();
         }
 
         const reqHandler = isInternal ? shellApiRequest : kubeApiRequest;
diff --git a/src/main/router.ts b/src/main/router.ts
index 53551b2624..b0b51a1b2f 100644
--- a/src/main/router.ts
+++ b/src/main/router.ts
@@ -151,7 +151,9 @@ export class Router {
       this.router.add({ method: "get", path: "/{path*}" }, (apiReq: LensApiRequest) => {
         const { req, res } = apiReq.raw;
 
-        if (req.url === "/" || !req.url.startsWith("/build/")) req.url = "/build/OpenLensDev.html";
+        if (req.url === "/" || !req.url.startsWith("/build/")) {
+          req.url = `${publicPath}/${appName}.html`;
+        }
 
         this.dependencies.httpProxy.web(req, res, {
           target: "http://127.0.0.1:8080",
diff --git a/webpack.dev-server.ts b/webpack.dev-server.ts
index 16863b18d9..487c89c024 100644
--- a/webpack.dev-server.ts
+++ b/webpack.dev-server.ts
@@ -20,6 +20,7 @@ function createDevServer(): WebpackDevServer {
   const compiler = Webpack(config);
 
   const server = new WebpackDevServer({
+    setupExitSignals: true,
     headers: {
       "Access-Control-Allow-Origin": "*",
     },
@@ -50,11 +51,3 @@ function createDevServer(): WebpackDevServer {
 const server = createDevServer();
 
 server.start();
-
-process.once("SIGTERM", () => {
-  server.stop().then(() => process.exit(0));
-});
-
-process.once("SIGINT", () => {
-  server.stop().then(() => process.exit(0));
-});
diff --git a/webpack.main.ts b/webpack.main.ts
index 9097be0fbb..b6a6980ece 100755
--- a/webpack.main.ts
+++ b/webpack.main.ts
@@ -19,6 +19,7 @@ configs.push((): webpack.Configuration => {
   const { mainDir, buildDir, isDevelopment } = vars;
 
   return {
+    name: "lens-app-main",
     context: __dirname,
     target: "electron-main",
     mode: isDevelopment ? "development" : "production",
diff --git a/webpack.renderer.ts b/webpack.renderer.ts
index 0910cabde6..c7865aa7aa 100755
--- a/webpack.renderer.ts
+++ b/webpack.renderer.ts
@@ -24,7 +24,7 @@ export function webpackLensRenderer({ showVars = true } = {}): webpack.Configura
 
   return {
     target: "electron-renderer",
-    name: "lens-app",
+    name: "lens-app-renderer",
     mode: isDevelopment ? "development" : "production",
     // https://webpack.js.org/configuration/devtool/ (see description of each option)
     devtool: isDevelopment ? "cheap-module-source-map" : "source-map",