diff --git a/pkg/acme/webhook/apiserver/apiserver.go b/pkg/acme/webhook/apiserver/apiserver.go
index 4d3a70e70..237c3cd55 100644
--- a/pkg/acme/webhook/apiserver/apiserver.go
+++ b/pkg/acme/webhook/apiserver/apiserver.go
@@ -57,6 +57,7 @@ func init() {
 		&metav1.ListOptions{},
 		&metav1.ExportOptions{},
 		&metav1.GetOptions{},
+		&metav1.PatchOptions{},
 		&metav1.DeleteOptions{},
 		&metav1.CreateOptions{},
 		&metav1.UpdateOptions{},
diff --git a/pkg/acme/webhook/cmd/server/BUILD.bazel b/pkg/acme/webhook/cmd/server/BUILD.bazel
index 1d9ea0144..8a6931718 100644
--- a/pkg/acme/webhook/cmd/server/BUILD.bazel
+++ b/pkg/acme/webhook/cmd/server/BUILD.bazel
@@ -7,8 +7,8 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/acme/webhook:go_default_library",
+        "//pkg/acme/webhook/apis/acme/v1alpha1:go_default_library",
         "//pkg/acme/webhook/apiserver:go_default_library",
-        "//pkg/apis/certmanager/v1alpha1:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/server:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/server/options:go_default_library",
diff --git a/pkg/acme/webhook/cmd/server/start.go b/pkg/acme/webhook/cmd/server/start.go
index 7f390b731..9e542cad9 100644
--- a/pkg/acme/webhook/cmd/server/start.go
+++ b/pkg/acme/webhook/cmd/server/start.go
@@ -27,8 +27,8 @@ import (
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	genericoptions "k8s.io/apiserver/pkg/server/options"
 
+	whapi "github.com/jetstack/cert-manager/pkg/acme/webhook/apis/acme/v1alpha1"
 	"github.com/jetstack/cert-manager/pkg/acme/webhook/apiserver"
-	cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1"
 )
 
 const defaultEtcdPathPrefix = "/registry/acme.cert-manager.io"
@@ -48,7 +48,7 @@ func NewWebhookServerOptions(out, errOut io.Writer, groupName string, solvers ..
 		// TODO we will nil out the etcd storage options.  This requires a later level of k8s.io/apiserver
 		RecommendedOptions: genericoptions.NewRecommendedOptions(
 			defaultEtcdPathPrefix,
-			apiserver.Codecs.LegacyCodec(cmapi.SchemeGroupVersion),
+			apiserver.Codecs.LegacyCodec(whapi.SchemeGroupVersion),
 			nil,
 		),