diff --git a/charts/argo-cd/templates/argocd-metrics-service.yaml b/charts/argo-cd/templates/argocd-metrics-service.yaml
new file mode 100755
index 00000000..cd602581
--- /dev/null
+++ b/charts/argo-cd/templates/argocd-metrics-service.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: {{ include "argo-cd.name" . }}-metrics
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-metrics
+    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: server
+  name: {{ include "argo-cd.fullname" . }}-metrics
+spec:
+  ports:
+  - name: http
+    protocol: TCP
+    port: {{ .Values.server.serviceMetricsPort }}
+    targetPort: {{ .Values.server.containerMetricsPort }}
+  selector:
+    app: {{ include "argo-cd.name" . }}-server
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
diff --git a/charts/argo-cd/templates/argocd-server-deployment.yaml b/charts/argo-cd/templates/argocd-server-deployment.yaml
new file mode 100755
index 00000000..7f07bd55
--- /dev/null
+++ b/charts/argo-cd/templates/argocd-server-deployment.yaml
@@ -0,0 +1,56 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "argo-cd.fullname" . }}-server
+  labels:
+    app: {{ include "argo-cd.name" . }}-server
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-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: server
+spec:
+  selector:
+    matchLabels:
+      app: {{ include "argo-cd.name" . }}-server
+      app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
+  template:
+    metadata:
+      labels:
+        app: {{ include "argo-cd.name" . }}-server
+        app.kubernetes.io/name: {{ include "argo-cd.name" . }}-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: server
+    spec:
+      serviceAccountName: {{ include "argo-cd.fullname" . }}-server
+      initContainers:
+      - name: ui
+        image: {{ .Values.server.uiInitImage.repository }}:{{ .Values.server.uiInitImage.tag }}
+        imagePullPolicy: {{ .Values.server.uiInitImage.pullPolicy }}
+        command: [cp, -r, /app, /shared]
+        volumeMounts:
+        - mountPath: /shared
+          name: static-files
+      containers:
+      - name: argocd-server
+        image: {{ .Values.server.image.repository }}:{{ .Values.server.image.tag }}
+        imagePullPolicy: {{ .Values.server.image.pullPolicy }}
+        command: [argocd-server, --staticassets, /shared/app]
+        volumeMounts:
+        - mountPath: /shared
+          name: static-files
+        ports:
+        - containerPort: {{ .Values.server.containerPort }}
+        readinessProbe:
+          httpGet:
+            path: /healthz
+            port: {{ .Values.server.containerPort }}
+          initialDelaySeconds: 3
+          periodSeconds: 30
+      volumes:
+      - emptyDir: {}
+        name: static-files
diff --git a/charts/argo-cd/templates/argocd-server-service.yaml b/charts/argo-cd/templates/argocd-server-service.yaml
new file mode 100755
index 00000000..961e1d86
--- /dev/null
+++ b/charts/argo-cd/templates/argocd-server-service.yaml
@@ -0,0 +1,26 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "argo-cd.fullname" . }}-server
+  labels:
+    app: {{ include "argo-cd.name" . }}-server
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-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: server
+spec:
+  ports:
+  - name: http
+    protocol: TCP
+    port: {{ .Values.repoServer.servicePortHttp }}
+    targetPort: {{ .Values.repoServer.containerPort }}
+  - name: https
+    protocol: TCP
+    port: {{ .Values.repoServer.servicePortHttps }}
+    targetPort: {{ .Values.repoServer.containerPort }}
+  selector:
+    app: {{ include "argo-cd.name" . }}-server
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
+
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 366ee4e6..fa348d64 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -67,6 +67,14 @@ config:
             orgs:
             - name: your-github-org
               teams:
+  # The following keys hold the shared secret for authenticating GitHub/GitLab/BitBucket webhook
+  # events. To enable webhooks, configure one or more of the following keys with the shared git
+  # provider webhook secret. The payload URL configured in the git provider should use the
+  # /api/webhook endpoint of your Argo CD instance (e.g. https://argocd.example.com/api/webhook)
+    # webhook:
+    #   githubSecret: 
+    #   gitlabSecret:
+    #   bitbucketSecret:
 rbac:
 #   # An RBAC policy .csv file containing additional policy and role definitions.
 #   # See https://github.com/argoproj/argo-cd/blob/master/docs/rbac.md on how to write RBAC policies.