diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml
index 2ca00d71..b0d9038f 100644
--- a/charts/argo/templates/workflow-controller-config-map.yaml
+++ b/charts/argo/templates/workflow-controller-config-map.yaml
@@ -18,14 +18,14 @@ data:
       s3:
         {{- if .Values.useStaticCredentials }}
         accessKeySecret:
-          key: {{ .Values.artifactAccessKeySecret }}
-          name: {{ .Values.artifactSecretName | default (printf "%s-%s" .Release.Name "minio-user") }}
+          key: {{ .Values.artifactRepository.s3.accessKeySecret.key }}
+          name: {{ .Values.artifactRepository.s3.accessKeySecret.name | default (printf "%s-%s" .Release.Name "minio-user") }}
         secretKeySecret:
-          key: {{ .Values.artifactSecretKeySecret }}
-          name: {{ .Values.artifactSecretName | default (printf "%s-%s" .Release.Name "minio-user") }}
+          key: {{ .Values.artifactRepository.s3.secretKeySecret.key }}
+          name: {{ .Values.artifactRepository.s3.secretKeySecret.name | 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 }}
+        bucket: {{ .Values.artifactRepository.s3.bucket | default .Values.minioBucketName }}
+        endpoint: {{ .Values.artifactRepository.s3.endpoint | default (printf "%s-%s" .Release.Name "minio-svc:9000") }}
+        insecure: {{ .Values.artifactRepository.s3.insecure }}
       {{- end}}
     executorImage: "{{ .Values.imagesNamespace }}/{{ .Values.executorImage }}:{{ .Values.imagesTag }}"
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index ab0a893f..5020feae 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -21,6 +21,11 @@ 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
+
+artifactRepository:
+  s3:
+    accessKeySecret:
+      key: accesskey
+    secretKeySecret:
+      key: secretkey
+    insecure: true