diff --git a/apps/browser/webpack.base.js b/apps/browser/webpack.base.js
index bed4d3ac666..872da6600b4 100644
--- a/apps/browser/webpack.base.js
+++ b/apps/browser/webpack.base.js
@@ -10,8 +10,17 @@ const configurator = require("./config/config");
 const manifest = require("./webpack/manifest");
 const AngularCheckPlugin = require("./webpack/angular-check");
 
+module.exports.getEnv = function getEnv() {
+  const ENV = (process.env.ENV = process.env.NODE_ENV);
+  const manifestVersion = process.env.MANIFEST_VERSION == 3 ? 3 : 2;
+  const browser = process.env.BROWSER ?? "chrome";
+
+  return { ENV, manifestVersion, browser };
+};
+
 /**
  * @param {{
+ *  configName: string;
  *  popup: {
  *    entry: string;
  *    entryModule: string;
@@ -21,17 +30,16 @@ const AngularCheckPlugin = require("./webpack/angular-check");
  *  };
  *  tsConfig: string;
  *  additionalEntries?: { [outputPath: string]: string }
- * }} params - The parameters for building the config.
+ * }} params - The input parameters for building the config.
  */
-function buildConfig(params) {
+module.exports.buildConfig = function buildConfig(params) {
   if (process.env.NODE_ENV == null) {
     process.env.NODE_ENV = "development";
   }
-  const ENV = (process.env.ENV = process.env.NODE_ENV);
-  const manifestVersion = process.env.MANIFEST_VERSION == 3 ? 3 : 2;
-  const browser = process.env.BROWSER ?? "chrome";
 
-  console.log(`Building Manifest Version ${manifestVersion} app`);
+  const { ENV, manifestVersion, browser } = module.exports.getEnv();
+
+  console.log(`Building Manifest Version ${manifestVersion} app - ${params.configName} version`);
 
   const envConfig = configurator.load(ENV);
   configurator.log(envConfig);
@@ -335,7 +343,7 @@ function buildConfig(params) {
 
     // Manifest V2 background pages can be run through the regular build pipeline.
     // Since it's a standard webpage.
-    mainConfig.entry.background = "./src/platform/background.ts";
+    mainConfig.entry.background = params.background.entry;
     mainConfig.entry["content/fido2-page-script-delay-append-mv2"] =
       "./src/autofill/fido2/content/fido2-page-script-delay-append.mv2.ts";
 
@@ -432,6 +440,4 @@ function buildConfig(params) {
   }
 
   return configs;
-}
-
-module.exports.buildConfig = buildConfig;
+};
diff --git a/apps/browser/webpack.config.js b/apps/browser/webpack.config.js
index 25818547543..9eac990ab61 100644
--- a/apps/browser/webpack.config.js
+++ b/apps/browser/webpack.config.js
@@ -1,6 +1,7 @@
 const { buildConfig } = require("./webpack.base");
 
 module.exports = buildConfig({
+  configName: "OSS",
   popup: {
     entry: "./src/popup/main.ts",
     entryModule: "src/popup/app.module#AppModule",
diff --git a/bitwarden_license/bit-browser/webpack.config.js b/bitwarden_license/bit-browser/webpack.config.js
index 74c12d19d6d..294e2f16253 100644
--- a/bitwarden_license/bit-browser/webpack.config.js
+++ b/bitwarden_license/bit-browser/webpack.config.js
@@ -1,6 +1,7 @@
 const { buildConfig } = require("../../apps/browser/webpack.base");
 
 module.exports = buildConfig({
+  configName: "Commercial",
   popup: {
     entry: "../../bitwarden_license/bit-browser/src/popup/main.ts",
     entryModule: "../../bitwarden_license/bit-browser/src/popup/app.module#AppModule",