diff --git a/packages/connect-iframe/webpack/base.webpack.config.ts b/packages/connect-iframe/webpack/base.webpack.config.ts
index 3a8e0e9db3..25b5c5c05d 100644
--- a/packages/connect-iframe/webpack/base.webpack.config.ts
+++ b/packages/connect-iframe/webpack/base.webpack.config.ts
@@ -17,7 +17,7 @@ const commitHash =
 
 export const config: webpack.Configuration = {
     target: 'web',
-    mode: 'production',
+    mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',
     module: {
         rules: [
             {
@@ -30,7 +30,6 @@ export const config: webpack.Configuration = {
                     },
                 },
             },
-
             {
                 test: (input: string) => input.includes('background-sharedworker'),
                 loader: 'worker-loader',
@@ -131,13 +130,8 @@ export const config: webpack.Configuration = {
             ],
         }),
         new webpack.DefinePlugin({
-            process: {
-                env: {
-                    VERSION: JSON.stringify(version),
-                    COMMIT_HASH: JSON.stringify(commitHash),
-                    NODE_ENV: JSON.stringify(process.env.NODE_ENV),
-                },
-            },
+            'process.env.VERSION': JSON.stringify(version),
+            'process.env.COMMIT_HASH': JSON.stringify(commitHash),
         }),
     ],
 
diff --git a/packages/connect-iframe/webpack/core.webpack.config.ts b/packages/connect-iframe/webpack/core.webpack.config.ts
index 74bbde644c..a3c08cdd86 100644
--- a/packages/connect-iframe/webpack/core.webpack.config.ts
+++ b/packages/connect-iframe/webpack/core.webpack.config.ts
@@ -8,7 +8,7 @@ const DIST = path.resolve(__dirname, '../build');
 
 export const config: webpack.Configuration = {
     target: 'web',
-    mode: 'production',
+    mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',
     entry: {
         core: path.resolve(__dirname, '../../connect/src/core/index.ts'),
     },
diff --git a/packages/connect-popup/webpack/prod.webpack.config.ts b/packages/connect-popup/webpack/prod.webpack.config.ts
index 14205718bd..621a7f11fd 100644
--- a/packages/connect-popup/webpack/prod.webpack.config.ts
+++ b/packages/connect-popup/webpack/prod.webpack.config.ts
@@ -14,7 +14,7 @@ const commitHash = execSync('git rev-parse HEAD').toString().trim();
 
 const config: webpack.Configuration = {
     target: 'web',
-    mode: 'production',
+    mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',
     entry: {
         popup: path.resolve(__dirname, '../src/index.tsx'),
         log: path.resolve(__dirname, '../src/log.tsx'),
@@ -73,7 +73,6 @@ const config: webpack.Configuration = {
         new DefinePlugin({
             'process.env.VERSION': JSON.stringify(version),
             'process.env.COMMIT_HASH': JSON.stringify(commitHash),
-            'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
         }),
         new HtmlWebpackPlugin({
             chunks: ['popup'],