diff --git a/charts/argo-ci/.gitignore b/charts/argo-ci/.gitignore
new file mode 100644
index 00000000..ebf1d3dc
--- /dev/null
+++ b/charts/argo-ci/.gitignore
@@ -0,0 +1 @@
+charts
diff --git a/charts/argo-ci/.helmignore b/charts/argo-ci/.helmignore
new file mode 100644
index 00000000..f0c13194
--- /dev/null
+++ b/charts/argo-ci/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/charts/argo-ci/Chart.yaml b/charts/argo-ci/Chart.yaml
new file mode 100644
index 00000000..67c3d674
--- /dev/null
+++ b/charts/argo-ci/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: argo-ci
+version: 0.1.0
diff --git a/charts/argo-ci/requirements.lock b/charts/argo-ci/requirements.lock
new file mode 100644
index 00000000..355a093d
--- /dev/null
+++ b/charts/argo-ci/requirements.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: argo
+  repository: https://argoproj.github.io/argo-helm
+  version: 0.1.0
+digest: sha256:21178ca15d323c4fa0d8c11dd50b025a590578cee0521202badc2b704af4e292
+generated: 2018-01-03T12:11:21.170089-08:00
diff --git a/charts/argo-ci/requirements.yaml b/charts/argo-ci/requirements.yaml
new file mode 100644
index 00000000..71f297a1
--- /dev/null
+++ b/charts/argo-ci/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+- name: argo
+  version: 0.1.0
+  repository: https://argoproj.github.io/argo-helm
diff --git a/charts/argo-ci/templates/NOTES.txt b/charts/argo-ci/templates/NOTES.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/charts/argo-ci/templates/_helpers.tpl b/charts/argo-ci/templates/_helpers.tpl
new file mode 100644
index 00000000..f0d83d2e
--- /dev/null
+++ b/charts/argo-ci/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/charts/argo-ci/templates/ci-deployment.yaml b/charts/argo-ci/templates/ci-deployment.yaml
new file mode 100644
index 00000000..5f58e416
--- /dev/null
+++ b/charts/argo-ci/templates/ci-deployment.yaml
@@ -0,0 +1,28 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: {{ .Release.Name }}-ci
+  labels:
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  template:
+    metadata:
+      labels:
+        app: {{ .Release.Name }}-ci
+        release: {{ .Release.Name }}
+    spec:
+      containers:
+        - name: ci
+          image: "{{ .Values.imageNamespace }}/{{ .Values.ciImage }}:{{ .Values.imageTag }}"
+          env:
+          - name: IN_CLUSTER
+            value: "true"
+          - name: NAMESPACE
+            value: 'default'
+          - name: ARGO_CI_IMAGE
+            value: {{ .Values.imageNamespace }}/{{ .Values.ciImage }}
+          ports:
+          - containerPort: 8001
+          - containerPort: 8002
diff --git a/charts/argo-ci/templates/ci-service.yaml b/charts/argo-ci/templates/ci-service.yaml
new file mode 100644
index 00000000..3c335c62
--- /dev/null
+++ b/charts/argo-ci/templates/ci-service.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-ci
+  labels:
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  ports:
+  - port: 80
+    protocol: TCP
+    targetPort: 8001
+  selector:
+    app: {{ .Release.Name }}-ci
+  sessionAffinity: None
+  type: LoadBalancer
diff --git a/charts/argo-ci/values.yaml b/charts/argo-ci/values.yaml
new file mode 100644
index 00000000..0c2e6f1b
--- /dev/null
+++ b/charts/argo-ci/values.yaml
@@ -0,0 +1,10 @@
+imageNamespace: argoproj
+ciImage: argoci
+imageTag: latest
+
+argo-ci:
+  imagesNamespace: argoproj
+  imagesTag: v2.0.0-alpha3
+  enableWebConsole: false
+  installMinio: true
+  minioBucketName: argo-artifacts
diff --git a/charts/argo/requirements.lock b/charts/argo/requirements.lock
index 3b7481c2..ef788117 100644
--- a/charts/argo/requirements.lock
+++ b/charts/argo/requirements.lock
@@ -2,5 +2,5 @@ dependencies:
 - name: minio
   repository: https://kubernetes-charts.storage.googleapis.com/
   version: 0.4.3
-digest: sha256:b67924f37f043c1fa76d5eeae48fc89bfb66d4f181bc470e321db4054959e63e
-generated: 2018-01-02T13:30:37.422817-08:00
+digest: sha256:2282e3be8457161f7fb79fe1a6a871a972146574b365e69b18d9c46e16d6c47d
+generated: 2018-01-03T12:09:41.060101-08:00
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 832c66d8..6dcac5bb 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -1,7 +1,7 @@
 imagesNamespace: argoproj
 controllerImage: workflow-controller
 uiImage: argoui
-imagesTag: latest
+imagesTag: v2.0.0-alpha3
 controllerName: workflow-controller
 enableWebConsole: false
 executorImage: argoexec