diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index df1fe0a109..0f1785c79b 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -21,19 +21,15 @@
     },
     {
       "label": "Run DevServer CE",
+      "group": "build",
+      "isBackground": true,
       "type": "shell",
       "command": "yarn",
-      "args": [
-        "dev",
-        "--",
-        "--",
-        "--env",
-        "server=${input:stage.ce}",
-        "--host",
-        "0.0.0.0"
-      ],
-      "isBackground": true,
+      "args": ["dev"],
       "options": {
+        "env": {
+          "server": "${input:stage.ce}"
+        },
         "cwd": "${workspaceFolder}/webapp/packages/product-default"
       }
     },
diff --git a/org.jkiss.cloudbeaver.tp.target b/org.jkiss.cloudbeaver.tp.target
index e0b2b692d9..9a7482ada6 100644
--- a/org.jkiss.cloudbeaver.tp.target
+++ b/org.jkiss.cloudbeaver.tp.target
@@ -3,6 +3,6 @@
 <target name="org.jkiss.tp.cloudbeaver">
 	<locations>
 		<location path="../eclipse/Eclipse.app/Contents/Eclipse/plugins" type="Directory"/>
-		<location path="../eclipse/plugins" type="Directory"/>
+		<location path="../eclipse/eclipse/plugins" type="Directory"/>
 	</locations>
 </target>
\ No newline at end of file
diff --git a/webapp/packages/core-cli/configs/webpack.product.dev.config.js b/webapp/packages/core-cli/configs/webpack.product.dev.config.js
index 6e99bfbd24..fe36dfde4b 100644
--- a/webapp/packages/core-cli/configs/webpack.product.dev.config.js
+++ b/webapp/packages/core-cli/configs/webpack.product.dev.config.js
@@ -35,7 +35,8 @@ if (fs.existsSync(certPath) && fs.existsSync(keyPath)) {
 }
 
 module.exports = (env, argv) => {
-  const urlObject = new URL(env.server);
+  const envServer = env.server ?? process.env.server;
+  const urlObject = new URL(envServer);
 
   return merge(commonConfig(env, argv), {
     mode: 'development',
@@ -49,6 +50,7 @@ module.exports = (env, argv) => {
     },
     devServer: {
       allowedHosts: 'all',
+      host: '0.0.0.0',
       // port: 8080,
       client: {
         webSocketURL: 'auto://0.0.0.0:0/ws',
@@ -57,7 +59,7 @@ module.exports = (env, argv) => {
       server,
       proxy: {
         '/api': {
-          target: env.server,
+          target: envServer,
         },
         '/api/ws': {
           target: `${urlObject.protocol === 'https:' ? 'wss:' : 'ws:'}//${urlObject.hostname}:${urlObject.port}/api/ws`,
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 380e46028f..028c46f55f 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -18313,7 +18313,7 @@ workbox-recipes@7.0.0:
     workbox-routing "7.0.0"
     workbox-strategies "7.0.0"
 
-workbox-routing@7.0.0:
+workbox-routing@7.0.0, workbox-routing@~7.x.x:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-7.0.0.tgz#6668438a06554f60645aedc77244a4fe3a91e302"
   integrity sha512-8YxLr3xvqidnbVeGyRGkaV4YdlKkn5qZ1LfEePW3dq+ydE73hUUJJuLmGEykW3fMX8x8mNdL0XrWgotcuZjIvA==