diff --git a/package.json b/package.json
index eff8721e1..3090803fe 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "build-backend-docs": "rm -rf ./docs/backend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/backend_api src/becca/entities/*.js src/services/backend_script_api.js src/services/sql.js",
     "build-frontend-docs": "rm -rf ./docs/frontend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/app/entities/*.js src/public/app/services/frontend_script_api.js src/public/app/widgets/right_panel_widget.js",
     "build-docs": "npm run build-backend-docs && npm run build-frontend-docs",
-    "webpack": "npx webpack -c webpack-desktop.config.js && npx webpack -c webpack-mobile.config.js && npx webpack -c webpack-setup.config.js",
+    "webpack": "webpack -c webpack.config.js",
     "test-jasmine": "jasmine",
     "test-es6": "node -r esm spec-es6/attribute_parser.spec.js ",
     "test": "npm run test-jasmine && npm run test-es6",
diff --git a/webpack-desktop.config.js b/webpack-desktop.config.js
deleted file mode 100644
index 8fbf0e152..000000000
--- a/webpack-desktop.config.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const path = require('path');
-const assetPath = require('./src/services/asset_path');
-
-module.exports = {
-    mode: 'production',
-    entry: {
-        mobile: './src/public/app/desktop.js',
-    },
-    output: {
-        publicPath: `${assetPath}/app-dist/`,
-        path: path.resolve(__dirname, 'src/public/app-dist'),
-        filename: 'desktop.js'
-    },
-    devtool: 'source-map',
-    target: 'electron-renderer'
-};
diff --git a/webpack-setup.config.js b/webpack-setup.config.js
deleted file mode 100644
index dee04f090..000000000
--- a/webpack-setup.config.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const path = require('path');
-const assetPath = require('./src/services/asset_path');
-
-module.exports = {
-    mode: 'production',
-    entry: {
-        mobile: './src/public/app/setup.js',
-    },
-    output: {
-        publicPath: `${assetPath}/app-dist/`,
-        path: path.resolve(__dirname, 'src/public/app-dist'),
-        filename: 'setup.js'
-    },
-    devtool: 'source-map',
-    target: 'electron-renderer'
-};
diff --git a/webpack-mobile.config.js b/webpack.config.js
similarity index 69%
rename from webpack-mobile.config.js
rename to webpack.config.js
index 4fc72b8be..41077c00e 100644
--- a/webpack-mobile.config.js
+++ b/webpack.config.js
@@ -4,13 +4,15 @@ const assetPath = require('./src/services/asset_path');
 module.exports = {
     mode: 'production',
     entry: {
+        setup: './src/public/app/setup.js',
         mobile: './src/public/app/mobile.js',
+        desktop: './src/public/app/desktop.js',
     },
     output: {
         publicPath: `${assetPath}/app-dist/`,
         path: path.resolve(__dirname, 'src/public/app-dist'),
-        filename: 'mobile.js'
+        filename: '[name].js',
     },
     devtool: 'source-map',
-    target: 'electron-renderer'
+    target: 'electron-renderer',
 };