diff --git a/package.json b/package.json
index 165edfa..aae6c85 100644
--- a/package.json
+++ b/package.json
@@ -8,12 +8,12 @@
   "author": "abhijithvijayan <34790378+abhijithvijayan@users.noreply.github.com>",
   "license": "MIT",
   "scripts": {
-    "dev:chrome": "cross-env NODE_ENV=development cross-env TARGET=chrome webpack --watch --mode=development",
-    "dev:firefox": "cross-env NODE_ENV=development cross-env TARGET=firefox webpack --watch --mode=development",
-    "dev:opera": "cross-env NODE_ENV=development cross-env TARGET=opera webpack --watch --mode=development",
-    "build:chrome": "cross-env NODE_ENV=production cross-env TARGET=chrome webpack --mode=production",
-    "build:firefox": "cross-env NODE_ENV=production cross-env TARGET=firefox webpack --mode=production",
-    "build:opera": "cross-env NODE_ENV=production cross-env TARGET=opera webpack --mode=production",
+    "dev:chrome": "cross-env NODE_ENV=development cross-env TARGET_BROWSER=chrome webpack --watch --mode=development",
+    "dev:firefox": "cross-env NODE_ENV=development cross-env TARGET_BROWSER=firefox webpack --watch --mode=development",
+    "dev:opera": "cross-env NODE_ENV=development cross-env TARGET_BROWSER=opera webpack --watch --mode=development",
+    "build:chrome": "cross-env NODE_ENV=production cross-env TARGET_BROWSER=chrome webpack --mode=production",
+    "build:firefox": "cross-env NODE_ENV=production cross-env TARGET_BROWSER=firefox webpack --mode=production",
+    "build:opera": "cross-env NODE_ENV=production cross-env TARGET_BROWSER=opera webpack --mode=production",
     "build": "yarn run build:chrome && yarn run build:firefox && yarn run build:opera",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
diff --git a/webpack.config.js b/webpack.config.js
index 5814fbf..e69363c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -7,6 +7,8 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const FixStyleOnlyEntriesPlugin = require('webpack-fix-style-only-entries');
 
+const targetBrowser = process.env.TARGET_BROWSER;
+
 module.exports = {
     mode: 'development',
 
@@ -19,7 +21,7 @@ module.exports = {
 
     output: {
         filename: 'js/[name].bundle.js',
-        path: path.resolve(__dirname, 'extension', process.env.TARGET),
+        path: path.resolve(__dirname, 'extension', targetBrowser),
     },
 
     plugins: [
@@ -27,8 +29,8 @@ module.exports = {
         new FixStyleOnlyEntriesPlugin({ silent: true }),
         new CleanWebpackPlugin({
             cleanOnceBeforeBuildPatterns: [
-                path.join(process.cwd(), `extension/${process.env.TARGET}`),
-                path.join(process.cwd(), `extension/${process.env.TARGET}.zip`),
+                path.join(process.cwd(), `extension/${targetBrowser}`),
+                path.join(process.cwd(), `extension/${targetBrowser}.zip`),
             ],
             cleanStaleWebpackAssets: false,
             verbose: true,
@@ -36,7 +38,7 @@ module.exports = {
         new CopyWebpackPlugin([
             { from: 'src/assets', to: 'assets' },
             {
-                from: `src/manifests/${process.env.TARGET}.json`,
+                from: `src/manifests/${targetBrowser}.json`,
                 transform(content, path) {
                     // generates the manifest file using the package.json informations
                     return Buffer.from(
@@ -128,7 +130,7 @@ module.exports = {
             }),
             new ZipPlugin({
                 path: path.resolve(__dirname, 'extension'),
-                filename: `${process.env.TARGET}.zip`,
+                filename: `${targetBrowser}.zip`,
             }),
         ],
     },