diff --git a/contrib/charts/cert-manager/Chart.yaml b/contrib/charts/cert-manager/Chart.yaml
index 135149201..1f677a47c 100644
--- a/contrib/charts/cert-manager/Chart.yaml
+++ b/contrib/charts/cert-manager/Chart.yaml
@@ -1,5 +1,5 @@
 name: cert-manager
-version: 0.2.2
+version: 0.2.3
 appVersion: 0.2.3
 description: A Helm chart for cert-manager
 home: https://github.com/jetstack/cert-manager
diff --git a/contrib/charts/cert-manager/README.md b/contrib/charts/cert-manager/README.md
index 78218ffd1..c6f8361e3 100644
--- a/contrib/charts/cert-manager/README.md
+++ b/contrib/charts/cert-manager/README.md
@@ -65,6 +65,8 @@ The following tables lists the configurable parameters of the cert-manager chart
 | `serviceAccount.name` | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the fullname template | ``
 | `resources` | CPU/memory resource requests/limits | `requests: {cpu: 10m, memory: 32Mi}` |
 | `nodeSelector` | Node labels for pod assignment | `{}` |
+| `affinity` | Node affinity for pod assignment | `{}` |
+| `tolerations` | Node tolerations for pod assignment | `[]` |
 | `ingressShim.enabled` | Enable ingress-shim for automatic ingress integration | `true`|
 | `ingressShim.extraArgs` | Optional flags for ingress-shim | `[]` |
 | `ingressShim.resources` | CPU/memory resource requests/limits for ingress-shim | `requests: {cpu: 10m, memory: 32Mi}` |
diff --git a/contrib/charts/cert-manager/templates/deployment.yaml b/contrib/charts/cert-manager/templates/deployment.yaml
index f9d3c70d9..107c6583f 100644
--- a/contrib/charts/cert-manager/templates/deployment.yaml
+++ b/contrib/charts/cert-manager/templates/deployment.yaml
@@ -44,7 +44,15 @@ spec:
           resources:
 {{ toYaml .Values.ingressShim.resources | indent 12 }}
 {{- end }}
-{{- if .Values.nodeSelector }}
+    {{- with .Values.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-{{- end }}
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/docs/deploy/rbac/certificate-crd.yaml b/docs/deploy/rbac/certificate-crd.yaml
index b997196da..495c8ef58 100644
--- a/docs/deploy/rbac/certificate-crd.yaml
+++ b/docs/deploy/rbac/certificate-crd.yaml
@@ -6,7 +6,7 @@ metadata:
   name: certificates.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/docs/deploy/rbac/clusterissuer-crd.yaml b/docs/deploy/rbac/clusterissuer-crd.yaml
index d0b999a5c..d4e00d035 100644
--- a/docs/deploy/rbac/clusterissuer-crd.yaml
+++ b/docs/deploy/rbac/clusterissuer-crd.yaml
@@ -6,7 +6,7 @@ metadata:
   name: clusterissuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/docs/deploy/rbac/deployment.yaml b/docs/deploy/rbac/deployment.yaml
index 333e77d9e..b90fcf075 100644
--- a/docs/deploy/rbac/deployment.yaml
+++ b/docs/deploy/rbac/deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/docs/deploy/rbac/issuer-crd.yaml b/docs/deploy/rbac/issuer-crd.yaml
index f1fac860e..7b08030fd 100644
--- a/docs/deploy/rbac/issuer-crd.yaml
+++ b/docs/deploy/rbac/issuer-crd.yaml
@@ -6,7 +6,7 @@ metadata:
   name: issuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/docs/deploy/rbac/rbac.yaml b/docs/deploy/rbac/rbac.yaml
index 822ffa841..9a4532387 100644
--- a/docs/deploy/rbac/rbac.yaml
+++ b/docs/deploy/rbac/rbac.yaml
@@ -6,7 +6,7 @@ metadata:
   name: cert-manager
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 rules:
@@ -31,7 +31,7 @@ metadata:
   name: cert-manager
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 roleRef:
diff --git a/docs/deploy/rbac/serviceaccount.yaml b/docs/deploy/rbac/serviceaccount.yaml
index 3f17c5cd4..830a573f6 100644
--- a/docs/deploy/rbac/serviceaccount.yaml
+++ b/docs/deploy/rbac/serviceaccount.yaml
@@ -7,6 +7,6 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
\ No newline at end of file
diff --git a/docs/deploy/without-rbac/certificate-crd.yaml b/docs/deploy/without-rbac/certificate-crd.yaml
index b997196da..495c8ef58 100644
--- a/docs/deploy/without-rbac/certificate-crd.yaml
+++ b/docs/deploy/without-rbac/certificate-crd.yaml
@@ -6,7 +6,7 @@ metadata:
   name: certificates.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/docs/deploy/without-rbac/clusterissuer-crd.yaml b/docs/deploy/without-rbac/clusterissuer-crd.yaml
index d0b999a5c..d4e00d035 100644
--- a/docs/deploy/without-rbac/clusterissuer-crd.yaml
+++ b/docs/deploy/without-rbac/clusterissuer-crd.yaml
@@ -6,7 +6,7 @@ metadata:
   name: clusterissuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/docs/deploy/without-rbac/deployment.yaml b/docs/deploy/without-rbac/deployment.yaml
index 644fc22c9..97b323bc6 100644
--- a/docs/deploy/without-rbac/deployment.yaml
+++ b/docs/deploy/without-rbac/deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/docs/deploy/without-rbac/issuer-crd.yaml b/docs/deploy/without-rbac/issuer-crd.yaml
index f1fac860e..7b08030fd 100644
--- a/docs/deploy/without-rbac/issuer-crd.yaml
+++ b/docs/deploy/without-rbac/issuer-crd.yaml
@@ -6,7 +6,7 @@ metadata:
   name: issuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec: