diff --git a/apps/web/project.json b/apps/web/project.json
index 4f51bf2274..710fd7cb5e 100644
--- a/apps/web/project.json
+++ b/apps/web/project.json
@@ -154,45 +154,15 @@
       },
       "configurations": {
         "oss": {
-          "buildTarget": "web:build:oss"
-        },
-        "oss-dev": {
           "buildTarget": "web:build:oss-dev"
         },
         "commercial": {
-          "buildTarget": "web:build:commercial"
-        },
-        "commercial-dev": {
           "buildTarget": "web:build:commercial-dev"
         },
-        "commercial-qa": {
-          "buildTarget": "web:build:commercial-qa"
-        },
-        "commercial-cloud": {
-          "buildTarget": "web:build:commercial-cloud"
-        },
-        "commercial-euprd": {
-          "buildTarget": "web:build:commercial-euprd"
-        },
-        "commercial-euqa": {
-          "buildTarget": "web:build:commercial-euqa"
-        },
-        "commercial-usdev": {
-          "buildTarget": "web:build:commercial-usdev"
-        },
-        "commercial-ee": {
-          "buildTarget": "web:build:commercial-ee"
-        },
         "oss-selfhost": {
-          "buildTarget": "web:build:oss-selfhost"
-        },
-        "oss-selfhost-dev": {
           "buildTarget": "web:build:oss-selfhost-dev"
         },
         "commercial-selfhost": {
-          "buildTarget": "web:build:commercial-selfhost"
-        },
-        "commercial-selfhost-dev": {
           "buildTarget": "web:build:commercial-selfhost-dev"
         }
       }
diff --git a/apps/web/webpack.base.js b/apps/web/webpack.base.js
index f1e627a58a..cc17b3b7cf 100644
--- a/apps/web/webpack.base.js
+++ b/apps/web/webpack.base.js
@@ -13,9 +13,11 @@ const config = require(path.resolve(__dirname, "config.js"));
 const pjson = require(path.resolve(__dirname, "package.json"));
 
 module.exports.getEnv = function getEnv(params) {
-  const ENV = params.env || (process.env.ENV == null ? "development" : process.env.ENV);
-  const NODE_ENV = process.env.NODE_ENV == null ? "development" : process.env.NODE_ENV;
-  const LOGGING = process.env.LOGGING != "false";
+  const ENV = params.env?.ENV ?? process.env?.ENV ?? "development";
+  const NODE_ENV = params.env?.NODE_ENV ?? process.env?.NODE_ENV ?? "development";
+  const LOGGING =
+    params.env?.LOGGING ??
+    (process.env?.LOGGING === undefined ? true : process.env.LOGGING !== "false");
 
   return { ENV, NODE_ENV, LOGGING };
 };
@@ -35,7 +37,11 @@ const DEFAULT_PARAMS = {
  *  tsConfig: string;
  *  outputPath?: string;
  *  mode?: string;
- *  env?: string;
+ *  env?: {
+ *      ENV?: string;
+ *      NODE_ENV?: string;
+ *      LOGGING?: boolean;
+ *    };
  *  importAliases?: import("webpack").ResolveOptions["alias"];
  * }} params
  */
diff --git a/apps/web/webpack.config.js b/apps/web/webpack.config.js
index 962d72ac82..275a6a5f3b 100644
--- a/apps/web/webpack.config.js
+++ b/apps/web/webpack.config.js
@@ -15,6 +15,7 @@ module.exports = (webpackConfig, context) => {
       },
       tsConfig: "apps/web/tsconfig.build.json",
       outputPath: path.resolve(context.context.root, context.options.outputPath),
+      env: context.options.env,
     });
   } else {
     return buildConfig({
diff --git a/bitwarden_license/bit-web/webpack.config.js b/bitwarden_license/bit-web/webpack.config.js
index 6433eee59f..8ab719072f 100644
--- a/bitwarden_license/bit-web/webpack.config.js
+++ b/bitwarden_license/bit-web/webpack.config.js
@@ -3,6 +3,7 @@ const { buildConfig } = require(path.resolve(__dirname, "../../apps/web/webpack.
 
 module.exports = (webpackConfig, context) => {
   const isNxBuild = context && context.options;
+
   if (isNxBuild) {
     return buildConfig({
       configName: "Commercial",
@@ -23,6 +24,7 @@ module.exports = (webpackConfig, context) => {
           alias: "@bitwarden/commercial-sdk-internal",
         },
       ],
+      env: context.options.env,
     });
   } else {
     return buildConfig({