diff --git a/examples/plain-yaml.yaml b/examples/plain-yaml.yaml
index 6394a2d64..21b426145 100644
--- a/examples/plain-yaml.yaml
+++ b/examples/plain-yaml.yaml
@@ -6,7 +6,7 @@ owner: account
 metadata:
   name: helm-mongo-values
 spec:
-  type: plain-yaml
+  type: yaml
   data:
     serviceType: LoadBalancer
     image: mongo
diff --git a/lib/interface/cli/commands/context/create.cmd.js b/lib/interface/cli/commands/context/create.cmd.js
index c51198acb..c73224192 100644
--- a/lib/interface/cli/commands/context/create.cmd.js
+++ b/lib/interface/cli/commands/context/create.cmd.js
@@ -17,7 +17,7 @@ const command = new Command({
             })
             .positional('type', {
                 describe: 'Type of the context',
-                choices: ['config', 'secret', 'helm-repository', 'plain-yaml', 'secret-yaml'],
+                choices: ['config', 'secret', 'helm-repository', 'yaml', 'secret-yaml'],
             })
             .option('owner', {
                 describe: 'Owner of the context',
diff --git a/lib/interface/cli/commands/context/get.cmd.js b/lib/interface/cli/commands/context/get.cmd.js
index c73c9e503..cf407a972 100644
--- a/lib/interface/cli/commands/context/get.cmd.js
+++ b/lib/interface/cli/commands/context/get.cmd.js
@@ -19,7 +19,7 @@ const command = new Command({
             })
             .option('type', {
                 describe: 'Specific type of context',
-                choices: ['config', 'secret', 'helm-repository', 'plain-yaml', 'secret-yaml'],
+                choices: ['config', 'secret', 'helm-repository', 'yaml', 'secret-yaml'],
             })
             .option('owner', {
                 describe: 'Owner of the context',
diff --git a/lib/interface/cli/commands/pipeline/dynamic/install-chart.cmd.js b/lib/interface/cli/commands/pipeline/dynamic/install-chart.cmd.js
index e111815fb..afda556d5 100644
--- a/lib/interface/cli/commands/pipeline/dynamic/install-chart.cmd.js
+++ b/lib/interface/cli/commands/pipeline/dynamic/install-chart.cmd.js
@@ -42,7 +42,7 @@ const install = new Command({
                 required: true,
             })
             .option('context', {
-                description: 'Contexts (plain-yaml) to be passed to the install',
+                description: 'Contexts (yaml || secret-yaml) to be passed to the install',
                 array: true,
             })
             .option('release-name', {
diff --git a/lib/logic/api/helm.js b/lib/logic/api/helm.js
index 5f797cb91..a9bf5f784 100644
--- a/lib/logic/api/helm.js
+++ b/lib/logic/api/helm.js
@@ -5,7 +5,7 @@ const { sendHttpRequest } = require('./helper');
 const { getContextByName } = require('./context');
 
 const SUPPORTED_TYPES = [
-    'plain-yaml',
+    'yaml',
     'secret-yaml',
 ];
 
diff --git a/package.json b/package.json
index c69ac05c2..120d2d48e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.6.9",
+  "version": "0.6.91",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,