diff --git a/contrib/charts/cert-manager/Chart.yaml b/contrib/charts/cert-manager/Chart.yaml
index 9f6a7c587..5ecd68a5f 100644
--- a/contrib/charts/cert-manager/Chart.yaml
+++ b/contrib/charts/cert-manager/Chart.yaml
@@ -1,5 +1,5 @@
 name: cert-manager
-version: v0.4.0-dev.3
+version: v0.4.0-dev.4
 appVersion: v0.4.0-dev.0
 description: A Helm chart for cert-manager
 home: https://github.com/jetstack/cert-manager
diff --git a/contrib/charts/cert-manager/templates/certificate-crd.yaml b/contrib/charts/cert-manager/templates/certificate-crd.yaml
index 1024900ba..0657c4af5 100644
--- a/contrib/charts/cert-manager/templates/certificate-crd.yaml
+++ b/contrib/charts/cert-manager/templates/certificate-crd.yaml
@@ -3,6 +3,10 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: certificates.certmanager.k8s.io
+{{- if semverCompare ">=2.10-0" .Capabilities.TillerVersion.SemVer }}
+  annotations:
+    "helm.sh/hook": crd-install
+{{- end }}
   labels:
     app: {{ template "cert-manager.name" . }}
     chart: {{ template "cert-manager.chart" . }}
diff --git a/contrib/charts/cert-manager/templates/clusterissuer-crd.yaml b/contrib/charts/cert-manager/templates/clusterissuer-crd.yaml
index f2f6e5767..cfa67b9ae 100644
--- a/contrib/charts/cert-manager/templates/clusterissuer-crd.yaml
+++ b/contrib/charts/cert-manager/templates/clusterissuer-crd.yaml
@@ -3,6 +3,10 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: clusterissuers.certmanager.k8s.io
+{{- if semverCompare ">=2.10-0" .Capabilities.TillerVersion.SemVer }}
+  annotations:
+    "helm.sh/hook": crd-install
+{{- end }}
   labels:
     app: {{ template "cert-manager.name" . }}
     chart: {{ template "cert-manager.chart" . }}
diff --git a/contrib/charts/cert-manager/templates/issuer-crd.yaml b/contrib/charts/cert-manager/templates/issuer-crd.yaml
index eb43f2a7b..5886676e5 100644
--- a/contrib/charts/cert-manager/templates/issuer-crd.yaml
+++ b/contrib/charts/cert-manager/templates/issuer-crd.yaml
@@ -3,6 +3,10 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: issuers.certmanager.k8s.io
+{{- if semverCompare ">=2.10-0" .Capabilities.TillerVersion.SemVer }}
+  annotations:
+    "helm.sh/hook": crd-install
+{{- end }}
   labels:
     app: {{ template "cert-manager.name" . }}
     chart: {{ template "cert-manager.chart" . }}
diff --git a/contrib/manifests/cert-manager/with-rbac.yaml b/contrib/manifests/cert-manager/with-rbac.yaml
index a10ff32bb..4c9728057 100644
--- a/contrib/manifests/cert-manager/with-rbac.yaml
+++ b/contrib/manifests/cert-manager/with-rbac.yaml
@@ -15,7 +15,7 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.3
+    chart: cert-manager-v0.4.0-dev.4
     release: cert-manager
     heritage: Tiller
 ---
@@ -26,7 +26,7 @@ metadata:
   name: certificates.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.3
+    chart: cert-manager-v0.4.0-dev.4
     release: cert-manager
     heritage: Tiller
 spec:
@@ -48,7 +48,7 @@ metadata:
   name: clusterissuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.3
+    chart: cert-manager-v0.4.0-dev.4
     release: cert-manager
     heritage: Tiller
 spec:
@@ -66,7 +66,7 @@ metadata:
   name: issuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.3
+    chart: cert-manager-v0.4.0-dev.4
     release: cert-manager
     heritage: Tiller
 spec:
@@ -84,7 +84,7 @@ metadata:
   name: cert-manager
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.3
+    chart: cert-manager-v0.4.0-dev.4
     release: cert-manager
     heritage: Tiller
 rules:
@@ -104,7 +104,7 @@ metadata:
   name: cert-manager
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.3
+    chart: cert-manager-v0.4.0-dev.4
     release: cert-manager
     heritage: Tiller
 roleRef:
@@ -124,7 +124,7 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.3
+    chart: cert-manager-v0.4.0-dev.4
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/contrib/manifests/cert-manager/without-rbac.yaml b/contrib/manifests/cert-manager/without-rbac.yaml
index 1266204fa..57d9694de 100644
--- a/contrib/manifests/cert-manager/without-rbac.yaml
+++ b/contrib/manifests/cert-manager/without-rbac.yaml
@@ -14,7 +14,7 @@ metadata:
   name: certificates.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.3
+    chart: cert-manager-v0.4.0-dev.4
     release: cert-manager
     heritage: Tiller
 spec:
@@ -36,7 +36,7 @@ metadata:
   name: clusterissuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.3
+    chart: cert-manager-v0.4.0-dev.4
     release: cert-manager
     heritage: Tiller
 spec:
@@ -54,7 +54,7 @@ metadata:
   name: issuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.3
+    chart: cert-manager-v0.4.0-dev.4
     release: cert-manager
     heritage: Tiller
 spec:
@@ -73,7 +73,7 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.3
+    chart: cert-manager-v0.4.0-dev.4
     release: cert-manager
     heritage: Tiller
 spec: