diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 13f2b2e7..e466dd25 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -1,20 +1,28 @@
-imagesNamespace: argoproj
-controllerImage: workflow-controller
-uiImage: argoui
-executorImage: argoexec
-imagesTag: v2.1.1
-controllerName: workflow-controller
+images:
+  namespace: argoproj
+  controller: workflow-controller
+  ui: argoui
+  executor: argoexec
+  tag: v2.1.1
+
+controller:
+  serviceAccount: argo
+  name: workflow-controller
+  workflowNamespaces: 
+    - default
+  # If set to true then chart set controller instance id to release name
+  useReleaseAsInstanceID: false
+  instanceID:
+
+ui:
+  name: ui
+  serviceType: LoadBalancer
+  serviceAccount: argo-ui
+  # Enables ability to SSH into pod using web UI
+  enableWebConsole: false
 
-# 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
 
@@ -22,12 +30,6 @@ useStaticCredentials: true
 installMinio: true
 minioBucketName: argo-artifacts
 
-workflowServiceAccount: argo
-uiServiceAccount: argo-ui
-
-workflowNamespaces:
-  - default
-
 artifactRepository:
   s3:
     accessKeySecret: