diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts
index 65fe1fb8c2..708e3c137b 100644
--- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts
@@ -144,9 +144,8 @@ containerService.attachToWindow(window);
 export function initFactory(): Function {
     return async () => {
         await (storageService as HtmlStorageService).init();
-        const isDev = platformUtilsService.isDev();
 
-        if (isDev || platformUtilsService.isSelfHost()) {
+        if (process.env.ENV !== 'production') {
             environmentService.baseUrl = window.location.origin;
         } else {
             environmentService.notificationsUrl = 'https://notifications.bitwarden.com';
diff --git a/src/app/settings/payment.component.ts b/src/app/settings/payment.component.ts
index fb631baf77..c06ba2caa4 100644
--- a/src/app/settings/payment.component.ts
+++ b/src/app/settings/payment.component.ts
@@ -67,8 +67,8 @@ export class PaymentComponent implements OnInit {
         this.stripeScript.src = 'https://js.stripe.com/v3/';
         this.stripeScript.async = true;
         this.stripeScript.onload = () => {
-            this.stripe = (window as any).Stripe(this.platformUtilsService.isDev() ?
-                WebConstants.stripeTestKey : WebConstants.stripeLiveKey);
+            this.stripe = (window as any).Stripe(process.env.ENV === 'production'  ?
+                WebConstants.stripeLiveKey : WebConstants.stripeTestKey);
             this.stripeElements = this.stripe.elements();
             this.setStripeElement();
         };
diff --git a/webpack.config.js b/webpack.config.js
index 1057c8cc2a..9aad213860 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,15 +8,13 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 const AngularCompilerPlugin = require('@ngtools/webpack').AngularCompilerPlugin;
 const pjson = require('./package.json');
-const config = require('./config.js')
+const config = require('./config.js');
 
-if (process.env.NODE_ENV == null) {
-    process.env.NODE_ENV = 'development';
-}
+const ENV = process.env.ENV == null ? 'development' : process.env.ENV;
+const NODE_ENV = process.env.NODE_ENV == null ? 'development' : process.env.NODE_ENV;
 
-const NODE_ENV = process.env.NODE_ENV;
-const envConfig = config.load(process.env.ENV)
-config.log(envConfig)
+const envConfig = config.load(process.env.ENV);
+config.log(envConfig);
 
 const moduleRules = [
     {
@@ -131,7 +129,7 @@ const plugins = [
     }),
     new webpack.DefinePlugin({
         'process.env': {
-            'ENV': JSON.stringify(NODE_ENV),
+            'ENV': JSON.stringify(ENV),
             'SELF_HOST': JSON.stringify(process.env.SELF_HOST === 'true' ? true : false),
             'APPLICATION_VERSION': JSON.stringify(pjson.version),
             'CACHE_TAG': JSON.stringify(Math.random().toString(36).substring(7)),