diff --git a/charts/argo-cd/templates/argocd-application-controller-deployment.yaml b/charts/argo-cd/templates/argocd-application-controller-deployment.yaml
index b66e74a9..40aaa0ec 100755
--- a/charts/argo-cd/templates/argocd-application-controller-deployment.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller-deployment.yaml
@@ -2,10 +2,19 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "argo-cd.fullname" . }}-application-controller
+  labels:
+    app: {{ include "argo-cd.name" . }}-application-controller
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
+    helm.sh/chart: {{ include "argo-cd.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
+    app.kubernetes.io/component: application-controller
 spec:
   selector:
     matchLabels:
       app: {{ include "argo-cd.name" . }}-application-controller
+      app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
   template:
     metadata:
       labels:
diff --git a/charts/argo-cd/templates/argocd-application-controller-service.yaml b/charts/argo-cd/templates/argocd-application-controller-service.yaml
index d6c821d6..6d3eb3ec 100755
--- a/charts/argo-cd/templates/argocd-application-controller-service.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller-service.yaml
@@ -15,3 +15,4 @@ spec:
     targetPort: {{ .Values.applicationController.containerPort }}
   selector:
     app: {{ include "argo-cd.name" . }}-application-controller
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
diff --git a/charts/argo-cd/templates/argocd-repo-server-deployment.yaml b/charts/argo-cd/templates/argocd-repo-server-deployment.yaml
new file mode 100755
index 00000000..98a01726
--- /dev/null
+++ b/charts/argo-cd/templates/argocd-repo-server-deployment.yaml
@@ -0,0 +1,41 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "argo-cd.fullname" . }}-repo-server
+  labels:
+    app: {{ include "argo-cd.name" . }}-repo-server
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
+    helm.sh/chart: {{ include "argo-cd.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
+    app.kubernetes.io/component: repo-server
+spec:
+  selector:
+    matchLabels:
+      app: {{ include "argo-cd.name" . }}-repo-server
+      app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
+  template:
+    metadata:
+      labels:
+        app: {{ include "argo-cd.name" . }}-repo-server
+        app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
+        helm.sh/chart: {{ include "argo-cd.chart" . }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        app.kubernetes.io/managed-by: {{ .Release.Service }}
+        app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
+        app.kubernetes.io/component: repo-server
+    spec:
+      automountServiceAccountToken: false
+      containers:
+      - name: argocd-repo-server
+        image: {{ .Values.repoServer.image.repository }}:{{ .Values.repoServer.image.tag }}
+        imagePullPolicy: {{ .Values.repoServer.image.pullPolicy}}
+        command: [argocd-repo-server]
+        ports:
+        - containerPort: {{ .Values.repoServer.containerPort }}
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.repoServer.containerPort }}
+          initialDelaySeconds: 5
+          periodSeconds: 10
diff --git a/charts/argo-cd/templates/argocd-repo-server-service.yaml b/charts/argo-cd/templates/argocd-repo-server-service.yaml
new file mode 100755
index 00000000..05f5d1ea
--- /dev/null
+++ b/charts/argo-cd/templates/argocd-repo-server-service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "argo-cd.fullname" . }}-repo-server
+  labels:
+    app: {{ include "argo-cd.name" . }}-repo-server
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
+    helm.sh/chart: {{ include "argo-cd.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
+    app.kubernetes.io/component: repo-server
+spec:
+  ports:
+  - port: {{ .Values.repoServer.servicePort }}
+    targetPort: {{ .Values.repoServer.servicePort }}
+  selector:
+    app: {{ include "argo-cd.name" . }}-repo-server
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index cfc230a3..3ef4c658 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -21,7 +21,8 @@ server:
     pullPolicy: Always
     
 repoServer:
-  port: 8081
+  containerPort: 8081
+  servicePort: 8081
   image:
     repository: argoproj/argocd
     tag: v0.11.0