diff --git a/adjustAppPackageJson.js b/adjustAppPackageJson.js
index 35f02118c..359522f8d 100644
--- a/adjustAppPackageJson.js
+++ b/adjustAppPackageJson.js
@@ -1,9 +1,9 @@
 const fs = require('fs');
 
-function adjustRootPackageJson(file) {
+function adjustAppPackageJson(file) {
   const json = JSON.parse(fs.readFileSync(file, { encoding: 'utf-8' }));
-  json.workspaces.push('app');
+  json.workspaces = ['../packages/*'];
   fs.writeFileSync(file, JSON.stringify(json, null, 2), 'utf-8');
 }
 
-adjustRootPackageJson('package.json');
+adjustAppPackageJson('app/package.json');
diff --git a/package.json b/package.json
index c37cb3c04..0f83a25ef 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "build:filterparser": "yarn workspace dbgate-filterparser build",
     "build:tools": "yarn workspace dbgate-tools build",
     "build:lib": "yarn build:sqltree && yarn build:tools && yarn build:filterparser && yarn build:datalib",
-    "build:app": "yarn plugins:copydist && cd app && yarn build",
+    "build:app": "yarn plugins:copydist && cd app && yarn install && yarn build",
     "build:api": "yarn workspace dbgate-api build",
     "build:web": "yarn workspace dbgate-web build",
     "build:plugins:frontend": "workspaces-run --only=\"dbgate-plugin-*\" -- yarn build:frontend",