diff --git a/internal/apis/config/BUILD.bazel b/internal/apis/config/webhook/BUILD.bazel
similarity index 100%
rename from internal/apis/config/BUILD.bazel
rename to internal/apis/config/webhook/BUILD.bazel
diff --git a/internal/apis/config/doc.go b/internal/apis/config/webhook/doc.go
similarity index 100%
rename from internal/apis/config/doc.go
rename to internal/apis/config/webhook/doc.go
diff --git a/internal/apis/config/fuzzer/BUILD.bazel b/internal/apis/config/webhook/fuzzer/BUILD.bazel
similarity index 100%
rename from internal/apis/config/fuzzer/BUILD.bazel
rename to internal/apis/config/webhook/fuzzer/BUILD.bazel
diff --git a/internal/apis/config/fuzzer/fuzzer.go b/internal/apis/config/webhook/fuzzer/fuzzer.go
similarity index 100%
rename from internal/apis/config/fuzzer/fuzzer.go
rename to internal/apis/config/webhook/fuzzer/fuzzer.go
diff --git a/internal/apis/config/install/BUILD.bazel b/internal/apis/config/webhook/install/BUILD.bazel
similarity index 100%
rename from internal/apis/config/install/BUILD.bazel
rename to internal/apis/config/webhook/install/BUILD.bazel
diff --git a/internal/apis/config/install/install.go b/internal/apis/config/webhook/install/install.go
similarity index 100%
rename from internal/apis/config/install/install.go
rename to internal/apis/config/webhook/install/install.go
diff --git a/internal/apis/config/install/roundtrip_test.go b/internal/apis/config/webhook/install/roundtrip_test.go
similarity index 100%
rename from internal/apis/config/install/roundtrip_test.go
rename to internal/apis/config/webhook/install/roundtrip_test.go
diff --git a/internal/apis/config/register.go b/internal/apis/config/webhook/register.go
similarity index 88%
rename from internal/apis/config/register.go
rename to internal/apis/config/webhook/register.go
index ad71dbe3e..f9352266e 100644
--- a/internal/apis/config/register.go
+++ b/internal/apis/config/webhook/register.go
@@ -17,10 +17,9 @@ limitations under the License.
 package config
 
 import (
+	"github.com/jetstack/cert-manager/pkg/apis/config/webhook"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-
-	"github.com/jetstack/cert-manager/pkg/apis/config"
 )
 
 var (
@@ -29,7 +28,7 @@ var (
 )
 
 // SchemeGroupVersion is group version used to register these objects
-var SchemeGroupVersion = schema.GroupVersion{Group: config.GroupName, Version: runtime.APIVersionInternal}
+var SchemeGroupVersion = schema.GroupVersion{Group: webhook.GroupName, Version: runtime.APIVersionInternal}
 
 // Resource takes an unqualified resource and returns a Group qualified GroupResource
 func Resource(resource string) schema.GroupResource {
diff --git a/internal/apis/config/scheme/BUILD.bazel b/internal/apis/config/webhook/scheme/BUILD.bazel
similarity index 100%
rename from internal/apis/config/scheme/BUILD.bazel
rename to internal/apis/config/webhook/scheme/BUILD.bazel
diff --git a/internal/apis/config/scheme/scheme.go b/internal/apis/config/webhook/scheme/scheme.go
similarity index 100%
rename from internal/apis/config/scheme/scheme.go
rename to internal/apis/config/webhook/scheme/scheme.go
diff --git a/internal/apis/config/types_webhook.go b/internal/apis/config/webhook/types.go
similarity index 99%
rename from internal/apis/config/types_webhook.go
rename to internal/apis/config/webhook/types.go
index 2c4a3ba59..2d9939ddf 100644
--- a/internal/apis/config/types_webhook.go
+++ b/internal/apis/config/webhook/types.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package config
+package webhook
 
 import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
diff --git a/internal/apis/config/v1alpha1/BUILD.bazel b/internal/apis/config/webhook/v1alpha1/BUILD.bazel
similarity index 100%
rename from internal/apis/config/v1alpha1/BUILD.bazel
rename to internal/apis/config/webhook/v1alpha1/BUILD.bazel
diff --git a/internal/apis/config/v1alpha1/conversion.go b/internal/apis/config/webhook/v1alpha1/conversion.go
similarity index 100%
rename from internal/apis/config/v1alpha1/conversion.go
rename to internal/apis/config/webhook/v1alpha1/conversion.go
diff --git a/internal/apis/config/v1alpha1/defaults.go b/internal/apis/config/webhook/v1alpha1/defaults.go
similarity index 93%
rename from internal/apis/config/v1alpha1/defaults.go
rename to internal/apis/config/webhook/v1alpha1/defaults.go
index 60cb83552..950a8a489 100644
--- a/internal/apis/config/v1alpha1/defaults.go
+++ b/internal/apis/config/webhook/v1alpha1/defaults.go
@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"github.com/jetstack/cert-manager/pkg/apis/config/v1alpha1"
+	"github.com/jetstack/cert-manager/pkg/apis/config/webhook/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/utils/pointer"
 )
diff --git a/internal/apis/config/v1alpha1/doc.go b/internal/apis/config/webhook/v1alpha1/doc.go
similarity index 100%
rename from internal/apis/config/v1alpha1/doc.go
rename to internal/apis/config/webhook/v1alpha1/doc.go
diff --git a/internal/apis/config/v1alpha1/register.go b/internal/apis/config/webhook/v1alpha1/register.go
similarity index 85%
rename from internal/apis/config/v1alpha1/register.go
rename to internal/apis/config/webhook/v1alpha1/register.go
index 4b4d4c4bb..102d7dacc 100644
--- a/internal/apis/config/v1alpha1/register.go
+++ b/internal/apis/config/webhook/v1alpha1/register.go
@@ -17,14 +17,13 @@ limitations under the License.
 package v1alpha1
 
 import (
+	"github.com/jetstack/cert-manager/pkg/apis/config/webhook"
+	"github.com/jetstack/cert-manager/pkg/apis/config/webhook/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-
-	"github.com/jetstack/cert-manager/pkg/apis/config"
-	"github.com/jetstack/cert-manager/pkg/apis/config/v1alpha1"
 )
 
 // SchemeGroupVersion is group version used to register these objects
-var SchemeGroupVersion = schema.GroupVersion{Group: config.GroupName, Version: "v1alpha1"}
+var SchemeGroupVersion = schema.GroupVersion{Group: webhook.GroupName, Version: "v1alpha1"}
 
 // Resource takes an unqualified resource and returns a Group qualified GroupResource
 func Resource(resource string) schema.GroupResource {
diff --git a/internal/apis/config/v1alpha1/zz_generated.conversion.go b/internal/apis/config/webhook/v1alpha1/zz_generated.conversion.go
similarity index 99%
rename from internal/apis/config/v1alpha1/zz_generated.conversion.go
rename to internal/apis/config/webhook/v1alpha1/zz_generated.conversion.go
index 05d1e8bcd..114d09f6d 100644
--- a/internal/apis/config/v1alpha1/zz_generated.conversion.go
+++ b/internal/apis/config/webhook/v1alpha1/zz_generated.conversion.go
@@ -22,10 +22,10 @@ limitations under the License.
 package v1alpha1
 
 import (
+	"github.com/jetstack/cert-manager/pkg/apis/config/webhook/v1alpha1"
 	unsafe "unsafe"
 
 	config "github.com/jetstack/cert-manager/internal/apis/config"
-	v1alpha1 "github.com/jetstack/cert-manager/pkg/apis/config/v1alpha1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
diff --git a/internal/apis/config/v1alpha1/zz_generated.defaults.go b/internal/apis/config/webhook/v1alpha1/zz_generated.defaults.go
similarity index 94%
rename from internal/apis/config/v1alpha1/zz_generated.defaults.go
rename to internal/apis/config/webhook/v1alpha1/zz_generated.defaults.go
index c51a47bee..f7e0b36e9 100644
--- a/internal/apis/config/v1alpha1/zz_generated.defaults.go
+++ b/internal/apis/config/webhook/v1alpha1/zz_generated.defaults.go
@@ -22,7 +22,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/jetstack/cert-manager/pkg/apis/config/v1alpha1"
+	"github.com/jetstack/cert-manager/pkg/apis/config/webhook/v1alpha1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
diff --git a/internal/apis/config/validation/BUILD.bazel b/internal/apis/config/webhook/validation/BUILD.bazel
similarity index 100%
rename from internal/apis/config/validation/BUILD.bazel
rename to internal/apis/config/webhook/validation/BUILD.bazel
diff --git a/internal/apis/config/validation/validation.go b/internal/apis/config/webhook/validation/validation.go
similarity index 100%
rename from internal/apis/config/validation/validation.go
rename to internal/apis/config/webhook/validation/validation.go
diff --git a/internal/apis/config/zz_generated.deepcopy.go b/internal/apis/config/webhook/zz_generated.deepcopy.go
similarity index 100%
rename from internal/apis/config/zz_generated.deepcopy.go
rename to internal/apis/config/webhook/zz_generated.deepcopy.go
diff --git a/pkg/apis/config/BUILD.bazel b/pkg/apis/config/webhook/BUILD.bazel
similarity index 100%
rename from pkg/apis/config/BUILD.bazel
rename to pkg/apis/config/webhook/BUILD.bazel
diff --git a/pkg/apis/config/doc.go b/pkg/apis/config/webhook/doc.go
similarity index 100%
rename from pkg/apis/config/doc.go
rename to pkg/apis/config/webhook/doc.go
diff --git a/pkg/apis/config/v1alpha1/BUILD.bazel b/pkg/apis/config/webhook/v1alpha1/BUILD.bazel
similarity index 100%
rename from pkg/apis/config/v1alpha1/BUILD.bazel
rename to pkg/apis/config/webhook/v1alpha1/BUILD.bazel
diff --git a/pkg/apis/config/v1alpha1/doc.go b/pkg/apis/config/webhook/v1alpha1/doc.go
similarity index 100%
rename from pkg/apis/config/v1alpha1/doc.go
rename to pkg/apis/config/webhook/v1alpha1/doc.go
diff --git a/pkg/apis/config/v1alpha1/register.go b/pkg/apis/config/webhook/v1alpha1/register.go
similarity index 100%
rename from pkg/apis/config/v1alpha1/register.go
rename to pkg/apis/config/webhook/v1alpha1/register.go
diff --git a/pkg/apis/config/v1alpha1/types_webhook.go b/pkg/apis/config/webhook/v1alpha1/types.go
similarity index 100%
rename from pkg/apis/config/v1alpha1/types_webhook.go
rename to pkg/apis/config/webhook/v1alpha1/types.go
diff --git a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/config/webhook/v1alpha1/zz_generated.deepcopy.go
similarity index 100%
rename from pkg/apis/config/v1alpha1/zz_generated.deepcopy.go
rename to pkg/apis/config/webhook/v1alpha1/zz_generated.deepcopy.go