diff --git a/pkg/internal/apis/acme/BUILD.bazel b/pkg/internal/apis/acme/BUILD.bazel
index f7c2a512f..3c224bb17 100644
--- a/pkg/internal/apis/acme/BUILD.bazel
+++ b/pkg/internal/apis/acme/BUILD.bazel
@@ -16,7 +16,7 @@ go_library(
         "//pkg/apis/acme:go_default_library",
         "//pkg/internal/apis/meta:go_default_library",
         "@io_k8s_api//core/v1:go_default_library",
-        "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1beta1:go_default_library",
+        "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library",
         "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
         "@io_k8s_apimachinery//pkg/runtime:go_default_library",
         "@io_k8s_apimachinery//pkg/runtime/schema:go_default_library",
diff --git a/pkg/internal/apis/acme/fuzzer/BUILD.bazel b/pkg/internal/apis/acme/fuzzer/BUILD.bazel
index cd8dedca5..38296ef40 100644
--- a/pkg/internal/apis/acme/fuzzer/BUILD.bazel
+++ b/pkg/internal/apis/acme/fuzzer/BUILD.bazel
@@ -9,7 +9,7 @@ go_library(
         "//pkg/apis/certmanager/v1:go_default_library",
         "//pkg/internal/apis/acme:go_default_library",
         "@com_github_google_gofuzz//:go_default_library",
-        "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1beta1:go_default_library",
+        "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library",
         "@io_k8s_apimachinery//pkg/runtime/serializer:go_default_library",
     ],
 )
diff --git a/pkg/internal/apis/acme/fuzzer/fuzzer.go b/pkg/internal/apis/acme/fuzzer/fuzzer.go
index 325f35803..8cf797bf0 100644
--- a/pkg/internal/apis/acme/fuzzer/fuzzer.go
+++ b/pkg/internal/apis/acme/fuzzer/fuzzer.go
@@ -18,7 +18,7 @@ package fuzzer
 
 import (
 	fuzz "github.com/google/gofuzz"
-	apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 
 	v1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
@@ -42,7 +42,7 @@ var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
 				s.Spec.IssuerRef.Kind = v1.IssuerKind
 			}
 		},
-		func(s *apiext.JSON, c fuzz.Continue) {
+		func(s *apiextensionsv1.JSON, c fuzz.Continue) {
 			// ensure the webhook's config is valid JSON
 			s.Raw = []byte("{}")
 		},
diff --git a/pkg/internal/apis/acme/types_issuer.go b/pkg/internal/apis/acme/types_issuer.go
index 1bbdde545..2c56f801b 100644
--- a/pkg/internal/apis/acme/types_issuer.go
+++ b/pkg/internal/apis/acme/types_issuer.go
@@ -18,7 +18,7 @@ package acme
 
 import (
 	corev1 "k8s.io/api/core/v1"
-	apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 
 	cmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta"
 )
@@ -474,7 +474,7 @@ type ACMEIssuerDNS01ProviderWebhook struct {
 	// should use a SecretKeySelector to reference a Secret resource.
 	// For details on the schema of this field, consult the webhook provider
 	// implementation's documentation.
-	Config *apiext.JSON
+	Config *apiextensionsv1.JSON
 }
 
 type ACMEIssuerStatus struct {
diff --git a/pkg/internal/apis/acme/v1/BUILD.bazel b/pkg/internal/apis/acme/v1/BUILD.bazel
index 0c0f95ce3..dc749ec33 100644
--- a/pkg/internal/apis/acme/v1/BUILD.bazel
+++ b/pkg/internal/apis/acme/v1/BUILD.bazel
@@ -19,7 +19,7 @@ go_library(
         "//pkg/internal/apis/meta:go_default_library",
         "//pkg/internal/apis/meta/v1:go_default_library",
         "@io_k8s_api//core/v1:go_default_library",
-        "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1beta1:go_default_library",
+        "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library",
         "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
         "@io_k8s_apimachinery//pkg/conversion:go_default_library",
         "@io_k8s_apimachinery//pkg/runtime:go_default_library",
diff --git a/pkg/internal/apis/acme/v1/zz_generated.conversion.go b/pkg/internal/apis/acme/v1/zz_generated.conversion.go
index d3742086a..313fd8085 100644
--- a/pkg/internal/apis/acme/v1/zz_generated.conversion.go
+++ b/pkg/internal/apis/acme/v1/zz_generated.conversion.go
@@ -29,7 +29,7 @@ import (
 	meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta"
 	metav1 "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1"
 	corev1 "k8s.io/api/core/v1"
-	v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	pkgapismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -1198,7 +1198,7 @@ func Convert_acme_ACMEIssuerDNS01ProviderRoute53_To_v1_ACMEIssuerDNS01ProviderRo
 func autoConvert_v1_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01ProviderWebhook(in *v1.ACMEIssuerDNS01ProviderWebhook, out *acme.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
 	out.GroupName = in.GroupName
 	out.SolverName = in.SolverName
-	out.Config = (*v1beta1.JSON)(unsafe.Pointer(in.Config))
+	out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
 	return nil
 }
 
@@ -1210,7 +1210,7 @@ func Convert_v1_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01ProviderWe
 func autoConvert_acme_ACMEIssuerDNS01ProviderWebhook_To_v1_ACMEIssuerDNS01ProviderWebhook(in *acme.ACMEIssuerDNS01ProviderWebhook, out *v1.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
 	out.GroupName = in.GroupName
 	out.SolverName = in.SolverName
-	out.Config = (*v1beta1.JSON)(unsafe.Pointer(in.Config))
+	out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
 	return nil
 }
 
diff --git a/pkg/internal/apis/acme/v1alpha2/BUILD.bazel b/pkg/internal/apis/acme/v1alpha2/BUILD.bazel
index 8456d94a6..b0d311dc5 100644
--- a/pkg/internal/apis/acme/v1alpha2/BUILD.bazel
+++ b/pkg/internal/apis/acme/v1alpha2/BUILD.bazel
@@ -20,7 +20,7 @@ go_library(
         "//pkg/internal/apis/meta:go_default_library",
         "//pkg/internal/apis/meta/v1:go_default_library",
         "@io_k8s_api//core/v1:go_default_library",
-        "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1beta1:go_default_library",
+        "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library",
         "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
         "@io_k8s_apimachinery//pkg/conversion:go_default_library",
         "@io_k8s_apimachinery//pkg/runtime:go_default_library",
diff --git a/pkg/internal/apis/acme/v1alpha2/zz_generated.conversion.go b/pkg/internal/apis/acme/v1alpha2/zz_generated.conversion.go
index 8ffde9222..6dc28a977 100644
--- a/pkg/internal/apis/acme/v1alpha2/zz_generated.conversion.go
+++ b/pkg/internal/apis/acme/v1alpha2/zz_generated.conversion.go
@@ -29,7 +29,7 @@ import (
 	meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta"
 	metav1 "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1"
 	v1 "k8s.io/api/core/v1"
-	v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	pkgapismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -1198,7 +1198,7 @@ func Convert_acme_ACMEIssuerDNS01ProviderRoute53_To_v1alpha2_ACMEIssuerDNS01Prov
 func autoConvert_v1alpha2_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01ProviderWebhook(in *v1alpha2.ACMEIssuerDNS01ProviderWebhook, out *acme.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
 	out.GroupName = in.GroupName
 	out.SolverName = in.SolverName
-	out.Config = (*v1beta1.JSON)(unsafe.Pointer(in.Config))
+	out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
 	return nil
 }
 
@@ -1210,7 +1210,7 @@ func Convert_v1alpha2_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01Prov
 func autoConvert_acme_ACMEIssuerDNS01ProviderWebhook_To_v1alpha2_ACMEIssuerDNS01ProviderWebhook(in *acme.ACMEIssuerDNS01ProviderWebhook, out *v1alpha2.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
 	out.GroupName = in.GroupName
 	out.SolverName = in.SolverName
-	out.Config = (*v1beta1.JSON)(unsafe.Pointer(in.Config))
+	out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
 	return nil
 }
 
diff --git a/pkg/internal/apis/acme/v1alpha3/BUILD.bazel b/pkg/internal/apis/acme/v1alpha3/BUILD.bazel
index 13d9ce54b..eb676ddbe 100644
--- a/pkg/internal/apis/acme/v1alpha3/BUILD.bazel
+++ b/pkg/internal/apis/acme/v1alpha3/BUILD.bazel
@@ -20,7 +20,7 @@ go_library(
         "//pkg/internal/apis/meta:go_default_library",
         "//pkg/internal/apis/meta/v1:go_default_library",
         "@io_k8s_api//core/v1:go_default_library",
-        "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1beta1:go_default_library",
+        "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library",
         "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
         "@io_k8s_apimachinery//pkg/conversion:go_default_library",
         "@io_k8s_apimachinery//pkg/runtime:go_default_library",
diff --git a/pkg/internal/apis/acme/v1alpha3/zz_generated.conversion.go b/pkg/internal/apis/acme/v1alpha3/zz_generated.conversion.go
index 032e7e7b4..36712cbf8 100644
--- a/pkg/internal/apis/acme/v1alpha3/zz_generated.conversion.go
+++ b/pkg/internal/apis/acme/v1alpha3/zz_generated.conversion.go
@@ -29,7 +29,7 @@ import (
 	meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta"
 	metav1 "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1"
 	v1 "k8s.io/api/core/v1"
-	v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	pkgapismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -1198,7 +1198,7 @@ func Convert_acme_ACMEIssuerDNS01ProviderRoute53_To_v1alpha3_ACMEIssuerDNS01Prov
 func autoConvert_v1alpha3_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01ProviderWebhook(in *v1alpha3.ACMEIssuerDNS01ProviderWebhook, out *acme.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
 	out.GroupName = in.GroupName
 	out.SolverName = in.SolverName
-	out.Config = (*v1beta1.JSON)(unsafe.Pointer(in.Config))
+	out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
 	return nil
 }
 
@@ -1210,7 +1210,7 @@ func Convert_v1alpha3_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01Prov
 func autoConvert_acme_ACMEIssuerDNS01ProviderWebhook_To_v1alpha3_ACMEIssuerDNS01ProviderWebhook(in *acme.ACMEIssuerDNS01ProviderWebhook, out *v1alpha3.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
 	out.GroupName = in.GroupName
 	out.SolverName = in.SolverName
-	out.Config = (*v1beta1.JSON)(unsafe.Pointer(in.Config))
+	out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
 	return nil
 }
 
diff --git a/pkg/internal/apis/acme/v1beta1/BUILD.bazel b/pkg/internal/apis/acme/v1beta1/BUILD.bazel
index fba7b34dc..2bf759b38 100644
--- a/pkg/internal/apis/acme/v1beta1/BUILD.bazel
+++ b/pkg/internal/apis/acme/v1beta1/BUILD.bazel
@@ -19,7 +19,7 @@ go_library(
         "//pkg/internal/apis/meta:go_default_library",
         "//pkg/internal/apis/meta/v1:go_default_library",
         "@io_k8s_api//core/v1:go_default_library",
-        "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1beta1:go_default_library",
+        "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library",
         "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
         "@io_k8s_apimachinery//pkg/conversion:go_default_library",
         "@io_k8s_apimachinery//pkg/runtime:go_default_library",
diff --git a/pkg/internal/apis/acme/v1beta1/zz_generated.conversion.go b/pkg/internal/apis/acme/v1beta1/zz_generated.conversion.go
index 3e624438d..6c7a88ca9 100644
--- a/pkg/internal/apis/acme/v1beta1/zz_generated.conversion.go
+++ b/pkg/internal/apis/acme/v1beta1/zz_generated.conversion.go
@@ -29,7 +29,7 @@ import (
 	meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta"
 	metav1 "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1"
 	v1 "k8s.io/api/core/v1"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	pkgapismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -1198,7 +1198,7 @@ func Convert_acme_ACMEIssuerDNS01ProviderRoute53_To_v1beta1_ACMEIssuerDNS01Provi
 func autoConvert_v1beta1_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01ProviderWebhook(in *v1beta1.ACMEIssuerDNS01ProviderWebhook, out *acme.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
 	out.GroupName = in.GroupName
 	out.SolverName = in.SolverName
-	out.Config = (*apiextensionsv1beta1.JSON)(unsafe.Pointer(in.Config))
+	out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
 	return nil
 }
 
@@ -1210,7 +1210,7 @@ func Convert_v1beta1_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01Provi
 func autoConvert_acme_ACMEIssuerDNS01ProviderWebhook_To_v1beta1_ACMEIssuerDNS01ProviderWebhook(in *acme.ACMEIssuerDNS01ProviderWebhook, out *v1beta1.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
 	out.GroupName = in.GroupName
 	out.SolverName = in.SolverName
-	out.Config = (*apiextensionsv1beta1.JSON)(unsafe.Pointer(in.Config))
+	out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
 	return nil
 }
 
diff --git a/pkg/internal/apis/acme/zz_generated.deepcopy.go b/pkg/internal/apis/acme/zz_generated.deepcopy.go
index cfef98f6b..c086ef8a6 100644
--- a/pkg/internal/apis/acme/zz_generated.deepcopy.go
+++ b/pkg/internal/apis/acme/zz_generated.deepcopy.go
@@ -23,7 +23,7 @@ package acme
 import (
 	meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta"
 	v1 "k8s.io/api/core/v1"
-	v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
@@ -550,7 +550,7 @@ func (in *ACMEIssuerDNS01ProviderWebhook) DeepCopyInto(out *ACMEIssuerDNS01Provi
 	*out = *in
 	if in.Config != nil {
 		in, out := &in.Config, &out.Config
-		*out = new(v1beta1.JSON)
+		*out = new(apiextensionsv1.JSON)
 		(*in).DeepCopyInto(*out)
 	}
 	return