diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index 29d45405..52bd4afb 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -75,6 +75,8 @@ $ helm install --name my-release argo/argo-cd
 | repoServer.servicePort                 | int    | `8081`                 | Service port for repo server                                                                                                                                                                                                                                                  |
 | repoServer.volumeMounts                | list   | `[]`                   | Additional volume mounts                                                                                                                                                                                                                                                      |
 | repoServer.volumes                     | list   | `[]`                   | Additional volumes                                                                                                                                                                                                                                                            |
+| repoServer.initContainers              | list   | `[]`                   | Initialisation containers, see [values.yaml](./values.yaml) for syntax for Helm v2.12.3                                                                                                                                                                                       |
+| repoServer.imagePullSecrets            | list   | `[]`                   | List of image pull secrets, see [values.yaml](./values.yaml) for syntax for a secret called "docker-auth-secret"                                                                                                                                                              |
 | server.annotations                     | object | `{}`                   | Annotations for the server deployment                                                                                                                                                                                                                                         |
 | server.containerPort                   | int    | `8080`                 | Container port for server                                                                                                                                                                                                                                                     |
 | server.extraArgs                       | list   | `[]`                   | Add additional arguments                                                                                                                                                                                                                                                      |
@@ -87,5 +89,3 @@ $ helm install --name my-release argo/argo-cd
 | server.servicePortHttps                | int    | `443`                  | HTTPS Container port for server                                                                                                                                                                                                                                               |
 | server.volumeMounts                    | list   | `[]`                   | Additional volume mounts, see [values.yaml](./values.yaml) for syntax for SSH known hosts                                                                                                                                                                                     |
 | server.volumes                         | list   | `[]`                   | Additional volumes, see [values.yaml](./values.yaml) for syntax for SSH known hosts                                                                                                                                                                                           |
-| server.initContainers                  | list   | `[]`                   | Initialisation containers, see [values.yaml](./values.yaml) for syntax for Helm v2.12.3                                                                                                                                                                                       |
-| server.imagePullSecrets                | list   | `[]`                   | List of image pull secrets, see [values.yaml](./values.yaml) for syntax for a secret called "docker-auth-secret"                                                                                                                                                              |
diff --git a/charts/argo-cd/templates/argocd-repo-server-deployment.yaml b/charts/argo-cd/templates/argocd-repo-server-deployment.yaml
index 2dcc1a79..1adc05bd 100644
--- a/charts/argo-cd/templates/argocd-repo-server-deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server-deployment.yaml
@@ -59,3 +59,11 @@ spec:
       {{- if .Values.repoServer.volumes }}
       {{ toYaml .Values.repoServer.volumes | nindent 6 | trim }}
       {{- end }}
+      {{- if .Values.repoServer.initContainers }}
+      initContainers:
+      {{ toYaml .Values.repoServer.initContainers | nindent 6 | trim }}
+      {{- end }}
+      {{- if .Values.repoServer.initContainers }}
+      imagePullSecrets:
+      {{ toYaml .Values.repoServer.imagePullSecrets | nindent 6 | trim }}
+      {{- end }}
\ No newline at end of file
diff --git a/charts/argo-cd/templates/argocd-server-deployment.yaml b/charts/argo-cd/templates/argocd-server-deployment.yaml
index e27552ba..1a94ecba 100644
--- a/charts/argo-cd/templates/argocd-server-deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server-deployment.yaml
@@ -74,11 +74,4 @@ spec:
       {{- if .Values.server.volumes }}
       {{ toYaml .Values.server.volumes | nindent 6 | trim }}
       {{- end }}
-      {{- if .Values.server.initContainers }}
-      initContainers:
-      {{ toYaml .Values.server.initContainers | nindent 6 | trim }}
-      {{- end }}
-      {{- if .Values.server.initContainers }}
-      imagePullSecrets:
-      {{ toYaml .Values.server.imagePullSecrets | nindent 6 | trim }}
-      {{- end }}
+
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index bf0936a2..32e131a4 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -27,8 +27,19 @@ server:
   # - name: ssh-known-hosts
   #   configMap:
   #     name: argocd-ssh-known-hosts-cm
-  # - name: custom-tools
-  #   emptyDir: {}
+  annotations: {}
+
+repoServer:
+  containerPort: 8081
+  servicePort: 8081
+  image:
+    repository: argoproj/argocd
+    tag: v1.2.3
+    pullPolicy: Always
+  volumeMounts: []
+  volumes: []
+  #   - name: custom-tools
+  #     emptyDir: {}
   initContainers: []
   # - name: download-tools
   #   image: alpine:3.8
@@ -41,17 +52,6 @@ server:
   #     name: custom-tools
   imagePullSecrets: []
   # - name: docker-auth-secret
-  annotations: {}
-
-repoServer:
-  containerPort: 8081
-  servicePort: 8081
-  image:
-    repository: argoproj/argocd
-    tag: v1.2.3
-    pullPolicy: Always
-  volumeMounts: []
-  volumes: []
 
 dexServer:
   containerPortHttp: 5556