diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml
index 9fca5e94..ad630c18 100644
--- a/charts/argo/templates/workflow-controller-config-map.yaml
+++ b/charts/argo/templates/workflow-controller-config-map.yaml
@@ -8,7 +8,11 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   config: |
+{{ if .Values.useReleaseAsInstanceID }}
+    instanceID: {{ .Release.Name }}
+{{ else }}
     instanceID: {{ .Values.instanceID }}
+{{ end }}
     artifactRepository:
 {{ if .Values.installMinio }}
       s3:
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 6dcac5bb..3ed21dc1 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -1,14 +1,17 @@
 imagesNamespace: argoproj
 controllerImage: workflow-controller
 uiImage: argoui
+executorImage: argoexec
 imagesTag: v2.0.0-alpha3
 controllerName: workflow-controller
+# Enables ability to SSH into pod using web UI
 enableWebConsole: false
-executorImage: argoexec
 uiName: ui
 crdVersion: v1alpha1
+# If set to true then chart set controller instance id to release name
+useReleaseAsInstanceID: false
 instanceID:
-serviceAccount:
 
+# If set to true then chart installs minio and generate according artifactRepository section in workflow controller config map
 installMinio: true
 minioBucketName: argo-artifacts