diff --git a/package.json b/package.json
index 691bc6cd..67ab51f6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@adobe/aio-cli-plugin-api-mesh",
-	"version": "5.3.0",
+	"version": "5.3.1",
 	"description": "Adobe I/O CLI plugin to develop and manage API mesh sources",
 	"keywords": [
 		"oclif-plugin"
diff --git a/src/constants.js b/src/constants.js
index adee4e23..09bf8dd6 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -1,5 +1,7 @@
 const { getCliEnv } = require('@adobe/aio-lib-env');
+const dotenv = require('dotenv');
 
+dotenv.config();
 const clientEnv = getCliEnv();
 
 const StageConstants = {
@@ -24,4 +26,16 @@ const ProdConstants = {
 };
 
 const envConstants = clientEnv === 'stage' ? StageConstants : ProdConstants;
-module.exports = { ...envConstants };
+
+// Export environment variables/constants
+module.exports = {
+	DEV_CONSOLE_BASE_URL: process.env.DEV_CONSOLE_BASE_URL || envConstants.DEV_CONSOLE_BASE_URL,
+	DEV_CONSOLE_API_KEY: process.env.DEV_CONSOLE_API_KEY || envConstants.DEV_CONSOLE_API_KEY,
+	DEV_CONSOLE_TRANSPORTER_API_KEY:
+		process.env.DEV_CONSOLE_TRANSPORTER_API_KEY || envConstants.DEV_CONSOLE_TRANSPORTER_API_KEY,
+	AIO_CLI_API_KEY: process.env.AIO_CLI_API_KEY || envConstants.AIO_CLI_API_KEY,
+	SMS_BASE_URL: process.env.SMS_BASE_URL || envConstants.SMS_BASE_URL,
+	MESH_BASE_URL: process.env.MESH_BASE_URL || envConstants.MESH_BASE_URL,
+	MESH_SANDBOX_BASE_URL: process.env.MESH_SANDBOX_BASE_URL || envConstants.MESH_SANDBOX_BASE_URL,
+	SMS_API_KEY: process.env.SMS_API_KEY || envConstants.SMS_API_KEY,
+};
diff --git a/src/helpers.js b/src/helpers.js
index 04be1d33..9979ff5c 100644
--- a/src/helpers.js
+++ b/src/helpers.js
@@ -452,15 +452,13 @@ function initMetadata(config) {
 		const { version, plugins, userAgent, platform, arch } = config;
 		const currentIntalledVersion = getCurrentInstalledPluginVersion(plugins);
 
-		const metadataHeaders = {
+		global.metadataHeaders = {
 			'x-aio-cli-version': version,
 			'x-aio-cli-user-agent': userAgent,
 			'x-aio-cli-platform': platform,
 			'x-aio-cli-arch': arch,
 			'x-aio-cli-plugin-api-mesh-version': currentIntalledVersion,
 		};
-
-		global.metadataHeaders = metadataHeaders;
 	} catch (error) {
 		logger.error('Unable to initialize metadata headers');
 		logger.error(error.message);