diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
index f7d981baa7..a05537d05d 100644
--- a/.github/workflows/push-master.yml
+++ b/.github/workflows/push-master.yml
@@ -47,9 +47,6 @@ jobs:
           # (No need to define this secret in the repo settings)
           github_token: ${{ secrets.github_token }}
           build_script_name: build:release:electron
-          # If the commit is tagged with a version (e.g. "v1.0.0"),
-          # release the app after building
-          release: ${{ startsWith(github.ref, 'refs/tags/v') }}
 
   dummy:
     name: Dummy
diff --git a/package.json b/package.json
index 91273c6f9f..15909be86e 100644
--- a/package.json
+++ b/package.json
@@ -46,10 +46,10 @@
     "build:release:www": "yarn polkadot-ci-ghact-build && yarn build:release:ipfs && yarn build:release:ghpages",
     "build:www": "rm -rf packages/apps/build && mkdir -p packages/apps/build && yarn run build:i18n && cd packages/apps && NODE_ENV=production webpack --config webpack.config.js",
     "build:electron": "yarn clean:electronBuild && yarn build:electronMain && yarn build:electronRenderer",
-    "build:devElectronRenderer": "cd packages/apps-electron && webpack-dev-server --color --progress --config webpack.renderer.config.js",
-    "build:electronRenderer": "cd packages/apps-electron && NODE_ENV=production webpack --config webpack.renderer.config.js",
-    "build:devElectronMain": "cd packages/apps-electron && webpack --config webpack.main.config.js",
-    "build:electronMain": "cd packages/apps-electron && NODE_ENV=production webpack --config webpack.main.config.js",
+    "build:devElectronRenderer": "cd packages/apps-electron && NODE_ENV=development webpack-dev-server --color --progress --config webpack.renderer.config.js",
+    "build:electronRenderer": "cd packages/apps-electron && webpack --config webpack.renderer.config.js",
+    "build:devElectronMain": "cd packages/apps-electron && NODE_ENV=development webpack --config webpack.main.config.js",
+    "build:electronMain": "cd packages/apps-electron && webpack --config webpack.main.config.js",
     "build:release:electron": "yarn build && yarn build:electron && yarn postinstall:electron",
     "packElectron:test": "yarn build:release:electron && electron-builder --dir",
     "packElectron:mac": "yarn build:release:electron && electron-builder build --mac",
diff --git a/packages/apps-electron/webpack.main.config.js b/packages/apps-electron/webpack.main.config.js
index 5dee58cbe7..b1dd7b683f 100644
--- a/packages/apps-electron/webpack.main.config.js
+++ b/packages/apps-electron/webpack.main.config.js
@@ -6,7 +6,7 @@
 
 const TerserPlugin = require('terser-webpack-plugin');
 const path = require('path');
-const ENV = process.env.NODE_ENV || 'development';
+const ENV = process.env.NODE_ENV || 'production';
 const isProd = ENV === 'production';
 
 function createWebpack () {
diff --git a/packages/apps-electron/webpack.renderer.config.js b/packages/apps-electron/webpack.renderer.config.js
index bb68521d62..c52efa5932 100644
--- a/packages/apps-electron/webpack.renderer.config.js
+++ b/packages/apps-electron/webpack.renderer.config.js
@@ -11,18 +11,20 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const findPackages = require('../../scripts/findPackages');
 
-const ENV = process.env.NODE_ENV || 'development';
+const ENV = process.env.NODE_ENV || 'production';
 const isProd = ENV === 'production';
 const context = __dirname;
 
 module.exports = merge(
   baseConfig({
+    ENV,
     alias: findPackages().reduce((alias, { dir, name }) => {
       alias[name] = path.resolve(context, `../${dir}/src`);
 
       return alias;
     }, {}),
-    context
+    context,
+    isProd
   }),
   {
     devServer: {
diff --git a/packages/apps/webpack.base.config.js b/packages/apps/webpack.base.config.js
index 2d4a305926..6348da1308 100644
--- a/packages/apps/webpack.base.config.js
+++ b/packages/apps/webpack.base.config.js
@@ -11,9 +11,7 @@ const webpack = require('webpack');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
-const ENV = process.env.NODE_ENV || 'development';
-
-function createWebpack ({ alias = {}, context, name = 'index' }) {
+function createWebpack ({ ENV, alias = {}, context, name = 'index' }) {
   const pkgJson = require(path.join(context, 'package.json'));
   const isProd = ENV === 'production';
   const hasPublic = fs.existsSync(path.join(context, 'public'));
diff --git a/packages/apps/webpack.config.js b/packages/apps/webpack.config.js
index ca9daaf0ac..8a22bd65ef 100644
--- a/packages/apps/webpack.config.js
+++ b/packages/apps/webpack.config.js
@@ -33,6 +33,7 @@ const plugins = isProd
 
 module.exports = merge(
   baseConfig({
+    ENV,
     alias: findPackages().reduce((alias, { dir, name }) => {
       alias[name] = path.resolve(context, `../${dir}/src`);