diff --git a/contrib/charts/cert-manager/templates/certificate-crd.yaml b/contrib/charts/cert-manager/templates/certificate-crd.yaml
index ec0a11a14..e674a058d 100644
--- a/contrib/charts/cert-manager/templates/certificate-crd.yaml
+++ b/contrib/charts/cert-manager/templates/certificate-crd.yaml
@@ -1,4 +1,5 @@
-{{- if .Values.createCRD -}}
+{{- if .Values.createCustomResource -}}
+{{- if .Capabilities.APIVersions.Has "apiextensions.k8s.io/v1beta1" -}}
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -9,5 +10,14 @@ spec:
   names:
     kind: Certificate
     plural: certificates
-  scope: Namespaced # Can also be cluster level using "Cluster"
+  scope: Namespaced
+{{ else if .Capabilities.APIVersions.Has "extensions/v1beta1"  }}
+apiVersion: extensions/v1beta1
+kind: ThirdPartyResource
+metadata:
+  name: certificate.certmanager.k8s.io
+description: "A specification for a cert-manager certificate"
+versions:
+- name: v1alpha1
+{{- end -}}
 {{- end -}}
diff --git a/contrib/charts/cert-manager/templates/issuer-crd.yaml b/contrib/charts/cert-manager/templates/issuer-crd.yaml
index 0bc64651e..10f5618fa 100644
--- a/contrib/charts/cert-manager/templates/issuer-crd.yaml
+++ b/contrib/charts/cert-manager/templates/issuer-crd.yaml
@@ -1,4 +1,5 @@
-{{- if .Values.createCRD -}}
+{{- if .Values.createCustomResource -}}
+{{- if .Capabilities.APIVersions.Has "apiextensions.k8s.io/v1beta1" -}}
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -9,5 +10,14 @@ spec:
   names:
     kind: Issuer
     plural: issuers
-  scope: Namespaced # Can also be cluster level using "Cluster"
+  scope: Namespaced
+{{ else if .Capabilities.APIVersions.Has "extensions/v1beta1"  }}
+apiVersion: extensions/v1beta1
+kind: ThirdPartyResource
+metadata:
+  name: issuer.certmanager.k8s.io
+description: "A specification for a cert-manager issuer"
+versions:
+- name: v1alpha1
+{{- end -}}
 {{- end -}}
diff --git a/contrib/charts/cert-manager/values.yaml b/contrib/charts/cert-manager/values.yaml
index 33e9dbcb7..c6c3e3e79 100644
--- a/contrib/charts/cert-manager/values.yaml
+++ b/contrib/charts/cert-manager/values.yaml
@@ -8,6 +8,6 @@ image:
   tag: canary
   pullPolicy: Always
 
-createCRD: true
+createCustomResource: true
 
 resources: {}