diff --git a/deploy/crds/crd-challenges.yaml b/deploy/crds/crd-challenges.yaml
index 605d8a222..775053514 100644
--- a/deploy/crds/crd-challenges.yaml
+++ b/deploy/crds/crd-challenges.yaml
@@ -82,6 +82,7 @@ spec:
           - dnsName
           - issuerRef
           - key
+          - solver
           - token
           - type
           - url
@@ -92,7 +93,9 @@ spec:
               type: string
             dnsName:
               description: DNSName is the identifier that this challenge is for, e.g.
-                example.com.
+                example.com. If the requested DNSName is a 'wildcard', this field
+                MUST be set to the non-wildcard domain, e.g. for `*.example.com`,
+                it must be `example.com`.
               type: string
             issuerRef:
               description: IssuerRef references a properly configured ACME-type Issuer
@@ -111,7 +114,13 @@ spec:
                 name:
                   type: string
             key:
-              description: Key is the ACME challenge key for this challenge
+              description: 'Key is the ACME challenge key for this challenge For HTTP01
+                challenges, this is the value that must be responded with to complete
+                the HTTP01 challenge in the format: `<private key JWK thumbprint>.<key
+                from acme server for challenge>`. For DNS01 challenges, this is the
+                base64 encoded SHA256 sum of the `<private key JWK thumbprint>.<key
+                from acme server for challenge>` text that must be set as the TXT
+                record content.'
               type: string
             solver:
               description: Solver contains the domain solving configuration that should
@@ -1390,11 +1399,12 @@ spec:
                       additionalProperties:
                         type: string
             token:
-              description: Token is the ACME challenge token for this challenge.
+              description: Token is the ACME challenge token for this challenge. This
+                is the raw value returned from the ACME server.
               type: string
             type:
               description: Type is the type of ACME challenge this resource represents,
-                e.g. "dns01" or "http01"
+                e.g. "dns01" or "http01".
               type: string
             url:
               description: URL is the URL of the ACME Challenge resource for this
@@ -1403,7 +1413,7 @@ spec:
               type: string
             wildcard:
               description: Wildcard will be true if this challenge is for a wildcard
-                identifier, for example '*.example.com'
+                identifier, for example '*.example.com'.
               type: boolean
         status:
           type: object
diff --git a/pkg/apis/acme/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/acme/v1alpha2/zz_generated.deepcopy.go
index f2201a647..5c36bac90 100644
--- a/pkg/apis/acme/v1alpha2/zz_generated.deepcopy.go
+++ b/pkg/apis/acme/v1alpha2/zz_generated.deepcopy.go
@@ -678,11 +678,7 @@ func (in *ChallengeList) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ChallengeSpec) DeepCopyInto(out *ChallengeSpec) {
 	*out = *in
-	if in.Solver != nil {
-		in, out := &in.Solver, &out.Solver
-		*out = new(ACMEChallengeSolver)
-		(*in).DeepCopyInto(*out)
-	}
+	in.Solver.DeepCopyInto(&out.Solver)
 	out.IssuerRef = in.IssuerRef
 	return
 }
diff --git a/pkg/apis/acme/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/acme/v1alpha3/zz_generated.deepcopy.go
index 411f14438..4d99267a2 100644
--- a/pkg/apis/acme/v1alpha3/zz_generated.deepcopy.go
+++ b/pkg/apis/acme/v1alpha3/zz_generated.deepcopy.go
@@ -678,11 +678,7 @@ func (in *ChallengeList) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ChallengeSpec) DeepCopyInto(out *ChallengeSpec) {
 	*out = *in
-	if in.Solver != nil {
-		in, out := &in.Solver, &out.Solver
-		*out = new(ACMEChallengeSolver)
-		(*in).DeepCopyInto(*out)
-	}
+	in.Solver.DeepCopyInto(&out.Solver)
 	out.IssuerRef = in.IssuerRef
 	return
 }
diff --git a/pkg/internal/apis/acme/v1alpha2/zz_generated.conversion.go b/pkg/internal/apis/acme/v1alpha2/zz_generated.conversion.go
index 0c25ed951..00d0d6abf 100644
--- a/pkg/internal/apis/acme/v1alpha2/zz_generated.conversion.go
+++ b/pkg/internal/apis/acme/v1alpha2/zz_generated.conversion.go
@@ -1079,14 +1079,16 @@ func Convert_acme_ChallengeList_To_v1alpha2_ChallengeList(in *acme.ChallengeList
 }
 
 func autoConvert_v1alpha2_ChallengeSpec_To_acme_ChallengeSpec(in *v1alpha2.ChallengeSpec, out *acme.ChallengeSpec, s conversion.Scope) error {
-	out.AuthzURL = in.AuthzURL
-	out.Type = string(in.Type)
 	out.URL = in.URL
+	out.AuthzURL = in.AuthzURL
 	out.DNSName = in.DNSName
+	out.Wildcard = in.Wildcard
+	out.Type = acme.ACMEChallengeType(in.Type)
 	out.Token = in.Token
 	out.Key = in.Key
-	out.Wildcard = in.Wildcard
-	out.Solver = (*acme.ACMEChallengeSolver)(unsafe.Pointer(in.Solver))
+	if err := Convert_v1alpha2_ACMEChallengeSolver_To_acme_ACMEChallengeSolver(&in.Solver, &out.Solver, s); err != nil {
+		return err
+	}
 	// TODO: Inefficient conversion - can we improve it?
 	if err := s.Convert(&in.IssuerRef, &out.IssuerRef, 0); err != nil {
 		return err
@@ -1100,14 +1102,16 @@ func Convert_v1alpha2_ChallengeSpec_To_acme_ChallengeSpec(in *v1alpha2.Challenge
 }
 
 func autoConvert_acme_ChallengeSpec_To_v1alpha2_ChallengeSpec(in *acme.ChallengeSpec, out *v1alpha2.ChallengeSpec, s conversion.Scope) error {
-	out.AuthzURL = in.AuthzURL
-	out.Type = v1alpha2.ACMEChallengeType(in.Type)
 	out.URL = in.URL
+	out.AuthzURL = in.AuthzURL
 	out.DNSName = in.DNSName
+	out.Wildcard = in.Wildcard
+	out.Type = v1alpha2.ACMEChallengeType(in.Type)
 	out.Token = in.Token
 	out.Key = in.Key
-	out.Wildcard = in.Wildcard
-	out.Solver = (*v1alpha2.ACMEChallengeSolver)(unsafe.Pointer(in.Solver))
+	if err := Convert_acme_ACMEChallengeSolver_To_v1alpha2_ACMEChallengeSolver(&in.Solver, &out.Solver, s); err != nil {
+		return err
+	}
 	// TODO: Inefficient conversion - can we improve it?
 	if err := s.Convert(&in.IssuerRef, &out.IssuerRef, 0); err != nil {
 		return err
diff --git a/pkg/internal/apis/acme/v1alpha3/zz_generated.conversion.go b/pkg/internal/apis/acme/v1alpha3/zz_generated.conversion.go
index 77ab08944..3ede332ec 100644
--- a/pkg/internal/apis/acme/v1alpha3/zz_generated.conversion.go
+++ b/pkg/internal/apis/acme/v1alpha3/zz_generated.conversion.go
@@ -1079,14 +1079,16 @@ func Convert_acme_ChallengeList_To_v1alpha3_ChallengeList(in *acme.ChallengeList
 }
 
 func autoConvert_v1alpha3_ChallengeSpec_To_acme_ChallengeSpec(in *v1alpha3.ChallengeSpec, out *acme.ChallengeSpec, s conversion.Scope) error {
-	out.AuthzURL = in.AuthzURL
-	out.Type = string(in.Type)
 	out.URL = in.URL
+	out.AuthzURL = in.AuthzURL
 	out.DNSName = in.DNSName
+	out.Wildcard = in.Wildcard
+	out.Type = acme.ACMEChallengeType(in.Type)
 	out.Token = in.Token
 	out.Key = in.Key
-	out.Wildcard = in.Wildcard
-	out.Solver = (*acme.ACMEChallengeSolver)(unsafe.Pointer(in.Solver))
+	if err := Convert_v1alpha3_ACMEChallengeSolver_To_acme_ACMEChallengeSolver(&in.Solver, &out.Solver, s); err != nil {
+		return err
+	}
 	// TODO: Inefficient conversion - can we improve it?
 	if err := s.Convert(&in.IssuerRef, &out.IssuerRef, 0); err != nil {
 		return err
@@ -1100,14 +1102,16 @@ func Convert_v1alpha3_ChallengeSpec_To_acme_ChallengeSpec(in *v1alpha3.Challenge
 }
 
 func autoConvert_acme_ChallengeSpec_To_v1alpha3_ChallengeSpec(in *acme.ChallengeSpec, out *v1alpha3.ChallengeSpec, s conversion.Scope) error {
-	out.AuthzURL = in.AuthzURL
-	out.Type = v1alpha3.ACMEChallengeType(in.Type)
 	out.URL = in.URL
+	out.AuthzURL = in.AuthzURL
 	out.DNSName = in.DNSName
+	out.Wildcard = in.Wildcard
+	out.Type = v1alpha3.ACMEChallengeType(in.Type)
 	out.Token = in.Token
 	out.Key = in.Key
-	out.Wildcard = in.Wildcard
-	out.Solver = (*v1alpha3.ACMEChallengeSolver)(unsafe.Pointer(in.Solver))
+	if err := Convert_acme_ACMEChallengeSolver_To_v1alpha3_ACMEChallengeSolver(&in.Solver, &out.Solver, s); err != nil {
+		return err
+	}
 	// TODO: Inefficient conversion - can we improve it?
 	if err := s.Convert(&in.IssuerRef, &out.IssuerRef, 0); err != nil {
 		return err
diff --git a/pkg/internal/apis/acme/zz_generated.deepcopy.go b/pkg/internal/apis/acme/zz_generated.deepcopy.go
index 59c93bc22..7ad8bd9fe 100644
--- a/pkg/internal/apis/acme/zz_generated.deepcopy.go
+++ b/pkg/internal/apis/acme/zz_generated.deepcopy.go
@@ -678,11 +678,7 @@ func (in *ChallengeList) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ChallengeSpec) DeepCopyInto(out *ChallengeSpec) {
 	*out = *in
-	if in.Solver != nil {
-		in, out := &in.Solver, &out.Solver
-		*out = new(ACMEChallengeSolver)
-		(*in).DeepCopyInto(*out)
-	}
+	in.Solver.DeepCopyInto(&out.Solver)
 	out.IssuerRef = in.IssuerRef
 	return
 }