diff --git a/lib/interface/cli/commands/hybrid/helper.js b/lib/interface/cli/commands/hybrid/helper.js
index bac7b5908..083357940 100644
--- a/lib/interface/cli/commands/hybrid/helper.js
+++ b/lib/interface/cli/commands/hybrid/helper.js
@@ -462,7 +462,7 @@ async function runClusterAcceptanceTests({
     if (envVars) {
         envVars.forEach((item) => {
             const parts = item.split('=');
-            cmd.push(`--set-value=EnvVars.${parts[0]}=${parts[1]}`);
+            cmd.push(`--set-value=EnvVars.${parts[0]}=${parts[1].replace(/,/g, '\\,')}`);
         });
     }
     if (valuesFile) {
@@ -565,7 +565,7 @@ async function installAgent({
     if (envVars) {
         envVars.forEach((item) => {
             const parts = item.split('=');
-            cmd.push(`--set-value=EnvVars.${parts[0]}=${parts[1]}`);
+            cmd.push(`--set-value=EnvVars.${parts[0]}=${parts[1].replace(/,/g, '\\,')}`);
         });
     }
     if (valuesFile) {
@@ -641,7 +641,7 @@ async function installRuntime({
     if (envVars) {
         envVars.forEach((item) => {
             const parts = item.split('=');
-            cmd.push(`--set-value=EnvVars.${parts[0]}=${parts[1]}`);
+            cmd.push(`--set-value=EnvVars.${parts[0]}=${parts[1].replace(/,/g, '\\,')}`);
         });
     }
     if (setFile) {
@@ -719,7 +719,7 @@ async function installAppProxy({
     if (envVars) {
         envVars.forEach((item) => {
             const parts = item.split('=');
-            cmd.push(`--set-value=EnvVars.${parts[0]}=${parts[1]}`);
+            cmd.push(`--set-value=EnvVars.${parts[0]}=${parts[1].replace(/,/g, '\\,')}`);
         });
     }
     if (valuesFile) {
diff --git a/lib/interface/cli/commands/monitor/install.cmd.js b/lib/interface/cli/commands/monitor/install.cmd.js
index d72d91968..15eba85ad 100644
--- a/lib/interface/cli/commands/monitor/install.cmd.js
+++ b/lib/interface/cli/commands/monitor/install.cmd.js
@@ -121,7 +121,7 @@ const installMonitorCmd = new Command({
         if (envVars) {
             envVars.forEach((item) => {
                 const parts = item.split('=');
-                commands.push(`--set-value=EnvVars.${parts[0]}=${parts[1]}`);
+                commands.push(`--set-value=EnvVars.${parts[0]}=${parts[1].replace(/,/g, '\\,')}`);
             });
         }
 
diff --git a/package.json b/package.json
index 425f8884d..f2b8613c6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.73.19",
+  "version": "0.73.20",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,