diff --git a/charts/argo/templates/ui-service.yaml b/charts/argo/templates/ui-service.yaml
index 103167d0..96e2c38f 100644
--- a/charts/argo/templates/ui-service.yaml
+++ b/charts/argo/templates/ui-service.yaml
@@ -14,4 +14,4 @@ spec:
   selector:
     app: {{ .Release.Name }}-{{ .Values.uiName}}
   sessionAffinity: None
-  type: LoadBalancer
+  type: {{ .Values.uiServiceType }}
diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml
index ad630c18..2ca00d71 100644
--- a/charts/argo/templates/workflow-controller-config-map.yaml
+++ b/charts/argo/templates/workflow-controller-config-map.yaml
@@ -1,29 +1,31 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.controllerName}}-configmap
+  name: {{ .Release.Name }}-{{ .Values.controllerName }}-configmap
   labels:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
   config: |
-{{ if .Values.useReleaseAsInstanceID }}
+    {{- if .Values.useReleaseAsInstanceID }}
     instanceID: {{ .Release.Name }}
-{{ else }}
+    {{- else }}
     instanceID: {{ .Values.instanceID }}
-{{ end }}
+    {{- end }}
     artifactRepository:
-{{ if .Values.installMinio }}
+      {{- if or .Values.installMinio .Values.useDefaultArtifactRepo }}
       s3:
+        {{- if .Values.useStaticCredentials }}
         accessKeySecret:
-          key: accesskey
-          name: {{ .Release.Name }}-minio-user
-        bucket: {{ .Values.minioBucketName }}
-        endpoint: {{ .Release.Name }}-minio-svc:9000
-        insecure: true
+          key: {{ .Values.artifactAccessKeySecret }}
+          name: {{ .Values.artifactSecretName | default (printf "%s-%s" .Release.Name "minio-user") }}
         secretKeySecret:
-          key: secretkey
-          name: {{ .Release.Name }}-minio-user
-{{ end }}
+          key: {{ .Values.artifactSecretKeySecret }}
+          name: {{ .Values.artifactSecretName | default (printf "%s-%s" .Release.Name "minio-user") }}
+        {{- end }}
+        bucket: {{ .Values.artifactBucketName | default .Values.minioBucketName }}
+        endpoint: {{ .Values.artifactEndpoint | default (printf "%s-%s" .Release.Name "minio-svc:9000") }}
+        insecure: {{ .Values.artifactInsecure }}
+      {{- end}}
     executorImage: "{{ .Values.imagesNamespace }}/{{ .Values.executorImage }}:{{ .Values.imagesTag }}"
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 3ed21dc1..ab0a893f 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -4,14 +4,23 @@ uiImage: argoui
 executorImage: argoexec
 imagesTag: v2.0.0-alpha3
 controllerName: workflow-controller
+
 # Enables ability to SSH into pod using web UI
 enableWebConsole: false
 uiName: ui
+uiServiceType: LoadBalancer
 crdVersion: v1alpha1
+
 # If set to true then chart set controller instance id to release name
 useReleaseAsInstanceID: false
 instanceID:
 
+useDefaultArtifactRepo: false
+useStaticCredentials: true
+
 # If set to true then chart installs minio and generate according artifactRepository section in workflow controller config map
 installMinio: true
 minioBucketName: argo-artifacts
+artifactAccessKeySecret: accesskey
+artifactSecretKeySecret: secretkey
+artifactInsecure: true