diff --git a/internal/cache/bbolt_cache.go b/internal/cache/bbolt_cache.go
index 2397009..79c1dc6 100644
--- a/internal/cache/bbolt_cache.go
+++ b/internal/cache/bbolt_cache.go
@@ -34,7 +34,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/rest"
 	toolscache "k8s.io/client-go/tools/cache"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
@@ -122,7 +122,7 @@ func WithBBoltCache(file string, opts ...Option) clients.NewCacheMiddlewareFn {
 			// set or wrap DefaultTransform.
 			o.DefaultTransform = wrapCacheTranform(o.DefaultTransform, bc.putObject)
 			// get undelying object from cache without copying.
-			o.DefaultUnsafeDisableDeepCopy = pointer.Bool(true)
+			o.DefaultUnsafeDisableDeepCopy = ptr.To(true)
 			// deep copy objects before returning by default.
 			bc.deepCopy = o.DefaultUnsafeDisableDeepCopy == nil || !*o.DefaultUnsafeDisableDeepCopy
 			ca, err := fn(cfg, o)
diff --git a/internal/graph/model/apiextensions_test.go b/internal/graph/model/apiextensions_test.go
index 0da8b3c..f7eaaae 100644
--- a/internal/graph/model/apiextensions_test.go
+++ b/internal/graph/model/apiextensions_test.go
@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
 	extv1 "github.com/crossplane/crossplane/apis/apiextensions/v1"
@@ -110,18 +110,18 @@ func TestGetCompositeResourceDefinition(t *testing.T) {
 					Group: "group",
 					Names: CompositeResourceDefinitionNames{
 						Plural:     "clusterexamples",
-						Singular:   pointer.String("clusterexample"),
+						Singular:   ptr.To("clusterexample"),
 						ShortNames: []string{"cex"},
 						Kind:       "ClusterExample",
-						ListKind:   pointer.String("ClusterExampleList"),
+						ListKind:   ptr.To("ClusterExampleList"),
 						Categories: []string{"example"},
 					},
 					ClaimNames: &CompositeResourceDefinitionNames{
 						Plural:     "examples",
-						Singular:   pointer.String("example"),
+						Singular:   ptr.To("example"),
 						ShortNames: []string{"ex"},
 						Kind:       "Example",
-						ListKind:   pointer.String("ExampleList"),
+						ListKind:   ptr.To("ExampleList"),
 						Categories: []string{"example"},
 					},
 					Versions: []CompositeResourceDefinitionVersion{{
@@ -196,7 +196,7 @@ func TestGetComposition(t *testing.T) {
 						APIVersion: "group/v1",
 						Kind:       "ClusterExample",
 					},
-					WriteConnectionSecretsToNamespace: pointer.String("ns"),
+					WriteConnectionSecretsToNamespace: ptr.To("ns"),
 				},
 			},
 			want: Composition{
@@ -215,7 +215,7 @@ func TestGetComposition(t *testing.T) {
 						APIVersion: "group/v1",
 						Kind:       "ClusterExample",
 					},
-					WriteConnectionSecretsToNamespace: pointer.String("ns"),
+					WriteConnectionSecretsToNamespace: ptr.To("ns"),
 				},
 			},
 		},
diff --git a/internal/graph/model/common.go b/internal/graph/model/common.go
index ac5a1a9..60c0a1b 100644
--- a/internal/graph/model/common.go
+++ b/internal/graph/model/common.go
@@ -24,7 +24,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kunstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
 	"github.com/crossplane/crossplane-runtime/pkg/errors"
@@ -180,7 +180,7 @@ func GetSecret(s *corev1.Secret) Secret {
 	}
 
 	if s.Type != "" {
-		out.Type = pointer.String(string(s.Type))
+		out.Type = ptr.To(string(s.Type))
 	}
 
 	return out
diff --git a/internal/graph/model/common_test.go b/internal/graph/model/common_test.go
index 1af1020..99eeba4 100644
--- a/internal/graph/model/common_test.go
+++ b/internal/graph/model/common_test.go
@@ -26,7 +26,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kunstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	kschema "k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
 	"github.com/crossplane/crossplane-runtime/pkg/test"
@@ -51,7 +51,7 @@ func TestGetConditions(t *testing.T) {
 				Status:             ConditionStatusTrue,
 				Reason:             string(xpv1.ReasonAvailable),
 				LastTransitionTime: c.LastTransitionTime.Time,
-				Message:            pointer.String("I'm here!"),
+				Message:            ptr.To("I'm here!"),
 			}},
 		},
 		"Empty": {
@@ -190,7 +190,7 @@ func TestGetSecret(t *testing.T) {
 				Metadata: ObjectMeta{
 					Name: "cool",
 				},
-				Type: pointer.String("cool"),
+				Type: ptr.To("cool"),
 				data: map[string]string{"cool": "secret"},
 			},
 		},
@@ -374,10 +374,10 @@ func TestGetCustomResourceDefinition(t *testing.T) {
 					Group: "group",
 					Names: CustomResourceDefinitionNames{
 						Plural:     "clusterexamples",
-						Singular:   pointer.String("clusterexample"),
+						Singular:   ptr.To("clusterexample"),
 						ShortNames: []string{"cex"},
 						Kind:       "ClusterExample",
-						ListKind:   pointer.String("ClusterExampleList"),
+						ListKind:   ptr.To("ClusterExampleList"),
 						Categories: []string{"example"},
 					},
 					Scope: ResourceScopeNamespaceScoped,
@@ -391,7 +391,7 @@ func TestGetCustomResourceDefinition(t *testing.T) {
 					Conditions: []Condition{{
 						Type:    string(kextv1.Established),
 						Reason:  "VeryCoolCRD",
-						Message: pointer.String("So cool"),
+						Message: ptr.To("So cool"),
 						// NOTE(tnthornton) transition is being truncated
 						// during marshaling.
 						LastTransitionTime: transition.Truncate(time.Second),
@@ -528,7 +528,7 @@ func TestGetKubernetesResource(t *testing.T) {
 						Name:      "cool",
 					},
 					Metadata: ObjectMeta{
-						Namespace: pointer.String("default"),
+						Namespace: ptr.To("default"),
 						Name:      "cool",
 					},
 					Spec: CompositeResourceClaimSpec{
diff --git a/internal/graph/model/composite_test.go b/internal/graph/model/composite_test.go
index 2d6591d..c5b61f5 100644
--- a/internal/graph/model/composite_test.go
+++ b/internal/graph/model/composite_test.go
@@ -23,7 +23,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kunstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
 	"github.com/crossplane/crossplane-runtime/pkg/resource/unstructured/claim"
@@ -152,7 +152,7 @@ func TestGetCompositeResourceClaim(t *testing.T) {
 				APIVersion: "example.org/v1",
 				Kind:       "CompositeResource",
 				Metadata: ObjectMeta{
-					Namespace: pointer.String("default"),
+					Namespace: ptr.To("default"),
 					Name:      "cool",
 				},
 				Spec: CompositeResourceClaimSpec{
diff --git a/internal/graph/model/event.go b/internal/graph/model/event.go
index 5e2ea89..b2654b5 100644
--- a/internal/graph/model/event.go
+++ b/internal/graph/model/event.go
@@ -16,7 +16,7 @@ package model
 
 import (
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 // GetEventType from the supplied Kubernetes event type.
@@ -53,17 +53,17 @@ func GetEvent(e *corev1.Event) Event {
 	}
 
 	if e.Reason != "" {
-		out.Reason = pointer.String(e.Reason)
+		out.Reason = ptr.To(e.Reason)
 	}
 	if e.Message != "" {
-		out.Message = pointer.String(e.Message)
+		out.Message = ptr.To(e.Message)
 	}
 	if e.Count != 0 {
 		c := int(e.Count)
 		out.Count = &c
 	}
 	if e.Source.Component != "" {
-		out.Source = &EventSource{Component: pointer.String(e.Source.Component)}
+		out.Source = &EventSource{Component: ptr.To(e.Source.Component)}
 	}
 	ft := e.FirstTimestamp.Time
 	out.FirstTime = &ft
diff --git a/internal/graph/model/event_test.go b/internal/graph/model/event_test.go
index 018f73c..d502fc7 100644
--- a/internal/graph/model/event_test.go
+++ b/internal/graph/model/event_test.go
@@ -23,7 +23,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kschema "k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func TestGetEvent(t *testing.T) {
@@ -67,11 +67,11 @@ func TestGetEvent(t *testing.T) {
 					Name: "cool",
 				},
 				Type:    &warn,
-				Reason:  pointer.String("BadStuff"),
-				Message: pointer.String("Bad stuff happened."),
+				Reason:  ptr.To("BadStuff"),
+				Message: ptr.To("Bad stuff happened."),
 				Count:   func() *int { i := 42; return &i }(),
 				Source: &EventSource{
-					Component: pointer.String("that-thing"),
+					Component: ptr.To("that-thing"),
 				},
 				FirstTime: &now,
 				LastTime:  &now,
diff --git a/internal/graph/model/fieldpath_test.go b/internal/graph/model/fieldpath_test.go
index 9f25d3c..504b04c 100644
--- a/internal/graph/model/fieldpath_test.go
+++ b/internal/graph/model/fieldpath_test.go
@@ -25,7 +25,7 @@ import (
 	kextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	"github.com/upbound/xgql/internal/unstructured"
 )
@@ -108,7 +108,7 @@ func TestPavedAccess_FieldPath(t *testing.T) {
 		"Success": {
 			reason: "Returns value at fieldPath.",
 			args: args{
-				fieldPath: pointer.String("metadata.name"),
+				fieldPath: ptr.To("metadata.name"),
 				object:    crd,
 			},
 			want: want{
@@ -118,7 +118,7 @@ func TestPavedAccess_FieldPath(t *testing.T) {
 		"Wildcard": {
 			reason: "Returns all values in expanded wildcard paths.",
 			args: args{
-				fieldPath: pointer.String("spec.status.conditions[*].reason"),
+				fieldPath: ptr.To("spec.status.conditions[*].reason"),
 				object:    crd,
 			},
 			want: want{
@@ -128,7 +128,7 @@ func TestPavedAccess_FieldPath(t *testing.T) {
 		"WrongPath": {
 			reason: "Returns nil.",
 			args: args{
-				fieldPath: pointer.String("bad.field.path"),
+				fieldPath: ptr.To("bad.field.path"),
 				object:    crd,
 			},
 			want: want{
diff --git a/internal/graph/model/objectmeta.go b/internal/graph/model/objectmeta.go
index d4eb3d0..e6dcd5b 100644
--- a/internal/graph/model/objectmeta.go
+++ b/internal/graph/model/objectmeta.go
@@ -18,7 +18,7 @@ import (
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 // ObjectMeta that is common to all Kubernetes objects.
@@ -51,10 +51,10 @@ func GetObjectMeta(m metav1.Object) ObjectMeta {
 	}
 
 	if n := m.GetGenerateName(); n != "" {
-		om.GenerateName = pointer.String(n)
+		om.GenerateName = ptr.To(n)
 	}
 	if n := m.GetNamespace(); n != "" {
-		om.Namespace = pointer.String(n)
+		om.Namespace = ptr.To(n)
 	}
 	if t := m.GetDeletionTimestamp(); t != nil {
 		om.DeletionTime = &t.Time
diff --git a/internal/graph/model/objectmeta_test.go b/internal/graph/model/objectmeta_test.go
index 3eb29d3..4fe3ee2 100644
--- a/internal/graph/model/objectmeta_test.go
+++ b/internal/graph/model/objectmeta_test.go
@@ -23,7 +23,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func TestGetObjectMeta(t *testing.T) {
@@ -56,9 +56,9 @@ func TestGetObjectMeta(t *testing.T) {
 				return u
 			}(),
 			want: ObjectMeta{
-				Namespace:       pointer.String("default"),
+				Namespace:       ptr.To("default"),
 				Name:            "cool-rando",
-				GenerateName:    pointer.String("cool-"),
+				GenerateName:    ptr.To("cool-"),
 				UID:             "no-you-id",
 				ResourceVersion: "42",
 				Generation:      42,
diff --git a/internal/graph/model/package_test.go b/internal/graph/model/package_test.go
index 9b481fd..27afd4c 100644
--- a/internal/graph/model/package_test.go
+++ b/internal/graph/model/package_test.go
@@ -22,7 +22,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
 	pkgv1 "github.com/crossplane/crossplane/apis/pkg/v1"
@@ -58,8 +58,8 @@ func TestGetProvider(t *testing.T) {
 						RevisionActivationPolicy:    &rap,
 						RevisionHistoryLimit:        &lim,
 						PackagePullPolicy:           &ppp,
-						IgnoreCrossplaneConstraints: pointer.Bool(true),
-						SkipDependencyResolution:    pointer.Bool(true),
+						IgnoreCrossplaneConstraints: ptr.To(true),
+						SkipDependencyResolution:    ptr.To(true),
 					},
 				},
 				Status: pkgv1.ProviderStatus{
@@ -88,13 +88,13 @@ func TestGetProvider(t *testing.T) {
 					RevisionActivationPolicy:    &mrap,
 					RevisionHistoryLimit:        &mlim,
 					PackagePullPolicy:           &mppp,
-					IgnoreCrossplaneConstraints: pointer.Bool(true),
-					SkipDependencyResolution:    pointer.Bool(true),
+					IgnoreCrossplaneConstraints: ptr.To(true),
+					SkipDependencyResolution:    ptr.To(true),
 				},
 				Status: &ProviderStatus{
 					Conditions:        []Condition{{}},
-					CurrentRevision:   pointer.String("8"),
-					CurrentIdentifier: pointer.String("coolthing:v1"),
+					CurrentRevision:   ptr.To("8"),
+					CurrentIdentifier: ptr.To("coolthing:v1"),
 				},
 			},
 		},
@@ -146,8 +146,8 @@ func TestGetProviderRevision(t *testing.T) {
 						Package:                     "coolthing:v1",
 						PackagePullPolicy:           &ppp,
 						Revision:                    42,
-						IgnoreCrossplaneConstraints: pointer.Bool(true),
-						SkipDependencyResolution:    pointer.Bool(true),
+						IgnoreCrossplaneConstraints: ptr.To(true),
+						SkipDependencyResolution:    ptr.To(true),
 					},
 				},
 				Status: pkgv1.PackageRevisionStatus{
@@ -183,8 +183,8 @@ func TestGetProviderRevision(t *testing.T) {
 					Package:                     "coolthing:v1",
 					PackagePullPolicy:           &mppp,
 					Revision:                    42,
-					IgnoreCrossplaneConstraints: pointer.Bool(true),
-					SkipDependencyResolution:    pointer.Bool(true),
+					IgnoreCrossplaneConstraints: ptr.To(true),
+					SkipDependencyResolution:    ptr.To(true),
 				},
 				Status: &ProviderRevisionStatus{
 					Conditions:            []Condition{{}},
@@ -252,8 +252,8 @@ func TestGetConfiguration(t *testing.T) {
 						RevisionActivationPolicy:    &rap,
 						RevisionHistoryLimit:        &lim,
 						PackagePullPolicy:           &ppp,
-						IgnoreCrossplaneConstraints: pointer.Bool(true),
-						SkipDependencyResolution:    pointer.Bool(true),
+						IgnoreCrossplaneConstraints: ptr.To(true),
+						SkipDependencyResolution:    ptr.To(true),
 					},
 				},
 				Status: pkgv1.ConfigurationStatus{
@@ -282,13 +282,13 @@ func TestGetConfiguration(t *testing.T) {
 					RevisionActivationPolicy:    &mrap,
 					RevisionHistoryLimit:        &mlim,
 					PackagePullPolicy:           &mppp,
-					IgnoreCrossplaneConstraints: pointer.Bool(true),
-					SkipDependencyResolution:    pointer.Bool(true),
+					IgnoreCrossplaneConstraints: ptr.To(true),
+					SkipDependencyResolution:    ptr.To(true),
 				},
 				Status: &ConfigurationStatus{
 					Conditions:        []Condition{{}},
-					CurrentRevision:   pointer.String("8"),
-					CurrentIdentifier: pointer.String("coolthing:v1"),
+					CurrentRevision:   ptr.To("8"),
+					CurrentIdentifier: ptr.To("coolthing:v1"),
 				},
 			},
 		},
@@ -339,8 +339,8 @@ func TestGetConfigurationRevision(t *testing.T) {
 					Package:                     "coolthing:v1",
 					PackagePullPolicy:           &ppp,
 					Revision:                    42,
-					IgnoreCrossplaneConstraints: pointer.Bool(true),
-					SkipDependencyResolution:    pointer.Bool(true),
+					IgnoreCrossplaneConstraints: ptr.To(true),
+					SkipDependencyResolution:    ptr.To(true),
 				},
 				Status: pkgv1.PackageRevisionStatus{
 					ConditionedStatus: xpv1.ConditionedStatus{
@@ -375,8 +375,8 @@ func TestGetConfigurationRevision(t *testing.T) {
 					Package:                     "coolthing:v1",
 					PackagePullPolicy:           &mppp,
 					Revision:                    42,
-					IgnoreCrossplaneConstraints: pointer.Bool(true),
-					SkipDependencyResolution:    pointer.Bool(true),
+					IgnoreCrossplaneConstraints: ptr.To(true),
+					SkipDependencyResolution:    ptr.To(true),
 				},
 				Status: &ConfigurationRevisionStatus{
 					Conditions:            []Condition{{}},
diff --git a/internal/graph/resolvers/apiextensions_test.go b/internal/graph/resolvers/apiextensions_test.go
index f9a07f9..66d86e6 100644
--- a/internal/graph/resolvers/apiextensions_test.go
+++ b/internal/graph/resolvers/apiextensions_test.go
@@ -25,7 +25,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
@@ -76,7 +76,7 @@ func TestCompositeResourceCrd(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -95,7 +95,7 @@ func TestCompositeResourceCrd(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetCRD).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetCRD)),
 				},
 			},
 		},
@@ -191,7 +191,7 @@ func TestCompositeResourceClaimCrd(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -210,7 +210,7 @@ func TestCompositeResourceClaimCrd(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetCRD).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetCRD)),
 				},
 			},
 		},
@@ -316,7 +316,7 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -338,7 +338,7 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListResources).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListResources)),
 				},
 			},
 		},
@@ -368,7 +368,7 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 						Group: group,
 						Names: model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							{
@@ -418,7 +418,7 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 						Group: group,
 						Names: model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// This version should be ignored because it is
@@ -467,7 +467,7 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 						Group: group,
 						Names: model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -484,7 +484,7 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 						},
 					},
 				},
-				options: &model.DefinedCompositeResourceOptionsInput{Version: pointer.String(version)},
+				options: &model.DefinedCompositeResourceOptionsInput{Version: ptr.To(version)},
 			},
 			want: want{
 				crc: model.CompositeResourceConnection{
@@ -519,7 +519,7 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 						Group: group,
 						Names: model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -536,7 +536,7 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 						},
 					},
 				},
-				version: pointer.String(version),
+				version: ptr.To(version),
 			},
 			want: want{
 				crc: model.CompositeResourceConnection{
@@ -571,7 +571,7 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 						Group: group,
 						Names: model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -588,8 +588,8 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 						},
 					},
 				},
-				options: &model.DefinedCompositeResourceOptionsInput{Version: pointer.String(version)},
-				version: pointer.String("v2"),
+				options: &model.DefinedCompositeResourceOptionsInput{Version: ptr.To(version)},
+				version: ptr.To("v2"),
 			},
 			want: want{
 				crc: model.CompositeResourceConnection{
@@ -615,7 +615,7 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 						Group: group,
 						Names: model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -658,7 +658,7 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 						Group: group,
 						Names: model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -675,7 +675,7 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 						},
 					},
 				},
-				options: &model.DefinedCompositeResourceOptionsInput{Ready: pointer.Bool(false)},
+				options: &model.DefinedCompositeResourceOptionsInput{Ready: ptr.To(false)},
 			},
 			want: want{
 				crc: model.CompositeResourceConnection{
@@ -701,7 +701,7 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 						Group: group,
 						Names: model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -718,7 +718,7 @@ func TestXRDDefinedCompositeResources(t *testing.T) {
 						},
 					},
 				},
-				options: &model.DefinedCompositeResourceOptionsInput{Ready: pointer.Bool(true)},
+				options: &model.DefinedCompositeResourceOptionsInput{Ready: ptr.To(true)},
 			},
 			want: want{
 				crc: model.CompositeResourceConnection{
@@ -823,7 +823,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -845,7 +845,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListResources).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListResources)),
 				},
 			},
 		},
@@ -875,7 +875,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						Group: group,
 						ClaimNames: &model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							{
@@ -925,7 +925,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						Group: group,
 						ClaimNames: &model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// This version should be ignored because it is
@@ -974,7 +974,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						Group: group,
 						ClaimNames: &model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -991,7 +991,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						},
 					},
 				},
-				options: &model.DefinedCompositeResourceClaimOptionsInput{Version: pointer.String(version)},
+				options: &model.DefinedCompositeResourceClaimOptionsInput{Version: ptr.To(version)},
 			},
 			want: want{
 				crcc: model.CompositeResourceClaimConnection{
@@ -1026,7 +1026,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						Group: group,
 						ClaimNames: &model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -1043,7 +1043,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						},
 					},
 				},
-				version: pointer.String(version),
+				version: ptr.To(version),
 			},
 			want: want{
 				crcc: model.CompositeResourceClaimConnection{
@@ -1078,7 +1078,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						Group: group,
 						ClaimNames: &model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -1095,8 +1095,8 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						},
 					},
 				},
-				options: &model.DefinedCompositeResourceClaimOptionsInput{Version: pointer.String(version)},
-				version: pointer.String("v2"),
+				options: &model.DefinedCompositeResourceClaimOptionsInput{Version: ptr.To(version)},
+				version: ptr.To("v2"),
 			},
 			want: want{
 				crcc: model.CompositeResourceClaimConnection{
@@ -1135,7 +1135,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						Group: group,
 						ClaimNames: &model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -1152,7 +1152,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						},
 					},
 				},
-				options: &model.DefinedCompositeResourceClaimOptionsInput{Version: pointer.String(version), Namespace: pointer.String("some-namespace")},
+				options: &model.DefinedCompositeResourceClaimOptionsInput{Version: ptr.To(version), Namespace: ptr.To("some-namespace")},
 			},
 			want: want{
 				crcc: model.CompositeResourceClaimConnection{
@@ -1191,7 +1191,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						Group: group,
 						ClaimNames: &model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -1208,8 +1208,8 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						},
 					},
 				},
-				options:   &model.DefinedCompositeResourceClaimOptionsInput{Version: pointer.String(version)},
-				namespace: pointer.String("some-namespace"),
+				options:   &model.DefinedCompositeResourceClaimOptionsInput{Version: ptr.To(version)},
+				namespace: ptr.To("some-namespace"),
 			},
 			want: want{
 				crcc: model.CompositeResourceClaimConnection{
@@ -1248,7 +1248,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						Group: group,
 						ClaimNames: &model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -1265,8 +1265,8 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						},
 					},
 				},
-				options:   &model.DefinedCompositeResourceClaimOptionsInput{Version: pointer.String(version), Namespace: pointer.String("some-namespace")},
-				namespace: pointer.String("some-other-namespace"),
+				options:   &model.DefinedCompositeResourceClaimOptionsInput{Version: ptr.To(version), Namespace: ptr.To("some-namespace")},
+				namespace: ptr.To("some-other-namespace"),
 			},
 			want: want{
 				crcc: model.CompositeResourceClaimConnection{
@@ -1292,7 +1292,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						Group: group,
 						ClaimNames: &model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -1335,7 +1335,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						Group: group,
 						ClaimNames: &model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -1352,7 +1352,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						},
 					},
 				},
-				options: &model.DefinedCompositeResourceClaimOptionsInput{Ready: pointer.Bool(false)},
+				options: &model.DefinedCompositeResourceClaimOptionsInput{Ready: ptr.To(false)},
 			},
 			want: want{
 				crcc: model.CompositeResourceClaimConnection{
@@ -1378,7 +1378,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						Group: group,
 						ClaimNames: &model.CompositeResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CompositeResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -1395,7 +1395,7 @@ func TestXRDDefinedCompositeResourceClaims(t *testing.T) {
 						},
 					},
 				},
-				options: &model.DefinedCompositeResourceClaimOptionsInput{Ready: pointer.Bool(true)},
+				options: &model.DefinedCompositeResourceClaimOptionsInput{Ready: ptr.To(true)},
 			},
 			want: want{
 				crcc: model.CompositeResourceClaimConnection{
@@ -1473,7 +1473,7 @@ func TestCompositeResourceDefinitionSpecDefaultComposition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -1492,7 +1492,7 @@ func TestCompositeResourceDefinitionSpecDefaultComposition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetComposition).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetComposition)),
 				},
 			},
 		},
@@ -1579,7 +1579,7 @@ func TestCompositeResourceDefinitionSpecEnforcedComposition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -1598,7 +1598,7 @@ func TestCompositeResourceDefinitionSpecEnforcedComposition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetComposition).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetComposition)),
 				},
 			},
 		},
diff --git a/internal/graph/resolvers/common.go b/internal/graph/resolvers/common.go
index 75512bd..d4c7517 100644
--- a/internal/graph/resolvers/common.go
+++ b/internal/graph/resolvers/common.go
@@ -23,7 +23,7 @@ import (
 	kunstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	"github.com/crossplane/crossplane-runtime/pkg/errors"
 
@@ -45,7 +45,7 @@ func (r *genericResource) Events(ctx context.Context, obj *model.GenericResource
 		APIVersion: obj.APIVersion,
 		Kind:       obj.Kind,
 		Name:       obj.Metadata.Name,
-		Namespace:  pointer.StringDeref(obj.Metadata.Namespace, ""),
+		Namespace:  ptr.Deref(obj.Metadata.Namespace, ""),
 		UID:        types.UID(obj.Metadata.UID),
 	})
 }
@@ -60,7 +60,7 @@ func (r *secret) Events(ctx context.Context, obj *model.Secret) (model.EventConn
 		APIVersion: obj.APIVersion,
 		Kind:       obj.Kind,
 		Name:       obj.Metadata.Name,
-		Namespace:  pointer.StringDeref(obj.Metadata.Namespace, ""),
+		Namespace:  ptr.Deref(obj.Metadata.Namespace, ""),
 		UID:        types.UID(obj.Metadata.UID),
 	})
 }
@@ -75,7 +75,7 @@ func (r *configMap) Events(ctx context.Context, obj *model.ConfigMap) (model.Eve
 		APIVersion: obj.APIVersion,
 		Kind:       obj.Kind,
 		Name:       obj.Metadata.Name,
-		Namespace:  pointer.StringDeref(obj.Metadata.Namespace, ""),
+		Namespace:  ptr.Deref(obj.Metadata.Namespace, ""),
 		UID:        types.UID(obj.Metadata.UID),
 	})
 }
diff --git a/internal/graph/resolvers/common_test.go b/internal/graph/resolvers/common_test.go
index 0c8248e..43bab10 100644
--- a/internal/graph/resolvers/common_test.go
+++ b/internal/graph/resolvers/common_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/vektah/gqlparser/v2/gqlerror"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/crossplane/crossplane-runtime/pkg/errors"
@@ -88,7 +88,7 @@ func TestCRDDefinedResources(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -110,7 +110,7 @@ func TestCRDDefinedResources(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListResources).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListResources)),
 				},
 			},
 		},
@@ -140,7 +140,7 @@ func TestCRDDefinedResources(t *testing.T) {
 						Group: group,
 						Names: model.CustomResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CustomResourceDefinitionVersion{
 							// This version should be ignored because it is
@@ -189,7 +189,7 @@ func TestCRDDefinedResources(t *testing.T) {
 						Group: group,
 						Names: model.CustomResourceDefinitionNames{
 							Kind:     kind,
-							ListKind: pointer.String(listKind),
+							ListKind: ptr.To(listKind),
 						},
 						Versions: []model.CustomResourceDefinitionVersion{
 							// Normally we'd pick this version first, but in
@@ -206,7 +206,7 @@ func TestCRDDefinedResources(t *testing.T) {
 						},
 					},
 				},
-				version: pointer.String(version),
+				version: ptr.To(version),
 			},
 			want: want{
 				krc: model.KubernetesResourceConnection{
diff --git a/internal/graph/resolvers/composite_test.go b/internal/graph/resolvers/composite_test.go
index be71344..1528874 100644
--- a/internal/graph/resolvers/composite_test.go
+++ b/internal/graph/resolvers/composite_test.go
@@ -101,7 +101,7 @@ func TestCompositeResourceDefinition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -118,7 +118,7 @@ func TestCompositeResourceDefinition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListXRDs).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListXRDs)),
 				},
 			},
 		},
@@ -235,7 +235,7 @@ func TestCompositeResourceSpecComposition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -254,7 +254,7 @@ func TestCompositeResourceSpecComposition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetComposition).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetComposition)),
 				},
 			},
 		},
@@ -422,7 +422,7 @@ func TestCompositeResourceSpecClaim(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -441,7 +441,7 @@ func TestCompositeResourceSpecClaim(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetXRC).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetXRC)),
 				},
 			},
 		},
@@ -608,7 +608,7 @@ func TestCompositeResourceSpecResources(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -641,7 +641,7 @@ func TestCompositeResourceSpecResources(t *testing.T) {
 					Nodes:      []model.KubernetesResource{gkrb},
 				},
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetComposed).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetComposed)),
 				},
 			},
 		},
@@ -788,7 +788,7 @@ func TestCompositeResourceSpecConnectionSecret(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -807,7 +807,7 @@ func TestCompositeResourceSpecConnectionSecret(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetSecret).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetSecret)),
 				},
 			},
 		},
@@ -994,7 +994,7 @@ func TestCompositeResourceClaimDefinition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -1011,7 +1011,7 @@ func TestCompositeResourceClaimDefinition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListXRDs).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListXRDs)),
 				},
 			},
 		},
@@ -1128,7 +1128,7 @@ func TestCompositeResourceClaimSpecComposition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -1147,7 +1147,7 @@ func TestCompositeResourceClaimSpecComposition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetComposition).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetComposition)),
 				},
 			},
 		},
@@ -1315,7 +1315,7 @@ func TestCompositeResourceClaimSpecResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -1334,7 +1334,7 @@ func TestCompositeResourceClaimSpecResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetXR).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetXR)),
 				},
 			},
 		},
@@ -1504,7 +1504,7 @@ func TestCompositeResourceClaimSpecConnectionSecret(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -1523,7 +1523,7 @@ func TestCompositeResourceClaimSpecConnectionSecret(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetSecret).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetSecret)),
 				},
 			},
 		},
diff --git a/internal/graph/resolvers/configuration_test.go b/internal/graph/resolvers/configuration_test.go
index f237409..d2a23a5 100644
--- a/internal/graph/resolvers/configuration_test.go
+++ b/internal/graph/resolvers/configuration_test.go
@@ -101,7 +101,7 @@ func TestConfigurationRevisions(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -117,7 +117,7 @@ func TestConfigurationRevisions(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListConfigRevs).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListConfigRevs)),
 				},
 			},
 		},
@@ -226,7 +226,7 @@ func TestConfigurationActiveRevision(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -242,7 +242,7 @@ func TestConfigurationActiveRevision(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListConfigRevs).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListConfigRevs)),
 				},
 			},
 		},
@@ -346,7 +346,7 @@ func TestConfigurationRevisionStatusObjects(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -407,7 +407,7 @@ func TestConfigurationRevisionStatusObjects(t *testing.T) {
 					TotalCount: 1,
 				},
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetXRD).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetXRD)),
 				},
 			},
 		},
@@ -446,7 +446,7 @@ func TestConfigurationRevisionStatusObjects(t *testing.T) {
 					TotalCount: 1,
 				},
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetComp).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetComp)),
 				},
 			},
 		},
diff --git a/internal/graph/resolvers/event_test.go b/internal/graph/resolvers/event_test.go
index 43c3335..3a42b02 100644
--- a/internal/graph/resolvers/event_test.go
+++ b/internal/graph/resolvers/event_test.go
@@ -78,7 +78,7 @@ func TestEvent(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -94,7 +94,7 @@ func TestEvent(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListEvents).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListEvents)),
 				},
 			},
 		},
@@ -303,7 +303,7 @@ func TestEventInvolvedObject(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -322,7 +322,7 @@ func TestEventInvolvedObject(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetInvolved).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetInvolved)),
 				},
 			},
 		},
diff --git a/internal/graph/resolvers/managed_test.go b/internal/graph/resolvers/managed_test.go
index 7d9a0a8..6e2224d 100644
--- a/internal/graph/resolvers/managed_test.go
+++ b/internal/graph/resolvers/managed_test.go
@@ -97,7 +97,7 @@ func TestManagedResourceDefinition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -114,7 +114,7 @@ func TestManagedResourceDefinition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetCRD).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetCRD)),
 				},
 			},
 		},
@@ -134,7 +134,7 @@ func TestManagedResourceDefinition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListCRDs).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListCRDs)),
 				},
 			},
 		},
@@ -282,7 +282,7 @@ func TestManagedResourceSpecConnectionSecret(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -301,7 +301,7 @@ func TestManagedResourceSpecConnectionSecret(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetSecret).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetSecret)),
 				},
 			},
 		},
diff --git a/internal/graph/resolvers/mutation_test.go b/internal/graph/resolvers/mutation_test.go
index 3108423..7109460 100644
--- a/internal/graph/resolvers/mutation_test.go
+++ b/internal/graph/resolvers/mutation_test.go
@@ -129,7 +129,7 @@ func TestCreateKubernetesResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -146,7 +146,7 @@ func TestCreateKubernetesResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errUnmarshal, errUnmarshalUnstructured).Error()),
+					gqlerror.Wrap(errors.Wrap(errUnmarshal, errUnmarshalUnstructured)),
 				},
 			},
 		},
@@ -166,7 +166,7 @@ func TestCreateKubernetesResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrapf(errUnmarshalPatch, errFmtUnmarshalPatch, 0).Error()),
+					gqlerror.Wrap(errors.Wrapf(errUnmarshalPatch, errFmtUnmarshalPatch, 0)),
 				},
 			},
 		},
@@ -187,7 +187,7 @@ func TestCreateKubernetesResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrapf(errFieldPath, errFmtPatch, 0).Error()),
+					gqlerror.Wrap(errors.Wrapf(errFieldPath, errFmtPatch, 0)),
 				},
 			},
 		},
@@ -206,7 +206,7 @@ func TestCreateKubernetesResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errCreateResource).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errCreateResource)),
 				},
 			},
 		},
@@ -297,7 +297,7 @@ func TestUpdateKubernetesResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -314,7 +314,7 @@ func TestUpdateKubernetesResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errUnmarshal, errUnmarshalUnstructured).Error()),
+					gqlerror.Wrap(errors.Wrap(errUnmarshal, errUnmarshalUnstructured)),
 				},
 			},
 		},
@@ -334,7 +334,7 @@ func TestUpdateKubernetesResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrapf(errUnmarshalPatch, errFmtUnmarshalPatch, 0).Error()),
+					gqlerror.Wrap(errors.Wrapf(errUnmarshalPatch, errFmtUnmarshalPatch, 0)),
 				},
 			},
 		},
@@ -355,7 +355,7 @@ func TestUpdateKubernetesResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrapf(errFieldPath, errFmtPatch, 0).Error()),
+					gqlerror.Wrap(errors.Wrapf(errFieldPath, errFmtPatch, 0)),
 				},
 			},
 		},
@@ -374,7 +374,7 @@ func TestUpdateKubernetesResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errUpdateResource).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errUpdateResource)),
 				},
 			},
 		},
@@ -462,7 +462,7 @@ func TestDeleteKubernetesResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -479,7 +479,7 @@ func TestDeleteKubernetesResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errDeleteResource).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errDeleteResource)),
 				},
 			},
 		},
diff --git a/internal/graph/resolvers/objectmeta.go b/internal/graph/resolvers/objectmeta.go
index 4354ccd..5bb6e25 100644
--- a/internal/graph/resolvers/objectmeta.go
+++ b/internal/graph/resolvers/objectmeta.go
@@ -21,7 +21,7 @@ import (
 	"github.com/99designs/gqlgen/graphql"
 	kunstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	"github.com/crossplane/crossplane-runtime/pkg/errors"
 
@@ -64,7 +64,7 @@ func (r *objectMeta) Owners(ctx context.Context, obj *model.ObjectMeta) (model.O
 			u.SetAPIVersion(ref.APIVersion)
 			u.SetKind(ref.Kind)
 
-			nn := types.NamespacedName{Namespace: pointer.StringDeref(obj.Namespace, ""), Name: ref.Name}
+			nn := types.NamespacedName{Namespace: ptr.Deref(obj.Namespace, ""), Name: ref.Name}
 			if err := c.Get(ctx, nn, u); err != nil {
 				graphql.AddError(ctx, errors.Wrap(err, errGetOwner))
 				return
@@ -98,7 +98,7 @@ func (r *objectMeta) Controller(ctx context.Context, obj *model.ObjectMeta) (mod
 	}
 
 	for _, ref := range obj.OwnerReferences {
-		if !pointer.BoolDeref(ref.Controller, false) {
+		if !ptr.Deref(ref.Controller, false) {
 			continue
 		}
 
@@ -106,7 +106,7 @@ func (r *objectMeta) Controller(ctx context.Context, obj *model.ObjectMeta) (mod
 		u.SetAPIVersion(ref.APIVersion)
 		u.SetKind(ref.Kind)
 
-		nn := types.NamespacedName{Namespace: pointer.StringDeref(obj.Namespace, ""), Name: ref.Name}
+		nn := types.NamespacedName{Namespace: ptr.Deref(obj.Namespace, ""), Name: ref.Name}
 		if err := c.Get(ctx, nn, u); err != nil {
 			graphql.AddError(ctx, errors.Wrap(err, errGetOwner))
 			return nil, nil
diff --git a/internal/graph/resolvers/objectmeta_test.go b/internal/graph/resolvers/objectmeta_test.go
index 5dd6374..4621ff3 100644
--- a/internal/graph/resolvers/objectmeta_test.go
+++ b/internal/graph/resolvers/objectmeta_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/vektah/gqlparser/v2/gqlerror"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/crossplane/crossplane-runtime/pkg/errors"
@@ -78,7 +78,7 @@ func TestObjectMetaOwners(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -107,7 +107,7 @@ func TestObjectMetaOwners(t *testing.T) {
 						{
 							APIVersion: ctrl.GetAPIVersion(),
 							Kind:       ctrl.GetKind(),
-							Controller: pointer.Bool(true),
+							Controller: ptr.To(true),
 						},
 					},
 				},
@@ -118,7 +118,7 @@ func TestObjectMetaOwners(t *testing.T) {
 					TotalCount: 1,
 				},
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetOwner).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetOwner)),
 				},
 			},
 		},
@@ -189,7 +189,7 @@ func TestObjectMetaController(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -207,14 +207,14 @@ func TestObjectMetaController(t *testing.T) {
 						{
 							APIVersion: ctrl.GetAPIVersion(),
 							Kind:       ctrl.GetKind(),
-							Controller: pointer.Bool(true),
+							Controller: ptr.To(true),
 						},
 					},
 				},
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetOwner).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetOwner)),
 				},
 			},
 		},
@@ -236,7 +236,7 @@ func TestObjectMetaController(t *testing.T) {
 						{
 							APIVersion: ctrl.GetAPIVersion(),
 							Kind:       ctrl.GetKind(),
-							Controller: pointer.Bool(true),
+							Controller: ptr.To(true),
 						},
 					},
 				},
diff --git a/internal/graph/resolvers/provider_test.go b/internal/graph/resolvers/provider_test.go
index 6251184..a58596d 100644
--- a/internal/graph/resolvers/provider_test.go
+++ b/internal/graph/resolvers/provider_test.go
@@ -102,7 +102,7 @@ func TestProviderRevisions(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -118,7 +118,7 @@ func TestProviderRevisions(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListProviderRevs).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListProviderRevs)),
 				},
 			},
 		},
@@ -227,7 +227,7 @@ func TestProviderActiveRevision(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -243,7 +243,7 @@ func TestProviderActiveRevision(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListProviderRevs).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListProviderRevs)),
 				},
 			},
 		},
@@ -346,7 +346,7 @@ func TestProviderRevisionStatusObjects(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -400,7 +400,7 @@ func TestProviderRevisionStatusObjects(t *testing.T) {
 					TotalCount: 0,
 				},
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetCRD).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetCRD)),
 				},
 			},
 		},
diff --git a/internal/graph/resolvers/providerconfig_test.go b/internal/graph/resolvers/providerconfig_test.go
index 088a34c..42d8944 100644
--- a/internal/graph/resolvers/providerconfig_test.go
+++ b/internal/graph/resolvers/providerconfig_test.go
@@ -94,7 +94,7 @@ func TestProviderConfigDefinition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -111,7 +111,7 @@ func TestProviderConfigDefinition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetCRD).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetCRD)),
 				},
 			},
 		},
@@ -131,7 +131,7 @@ func TestProviderConfigDefinition(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListCRDs).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListCRDs)),
 				},
 			},
 		},
diff --git a/internal/graph/resolvers/query.go b/internal/graph/resolvers/query.go
index 82cc39b..46a7bdb 100644
--- a/internal/graph/resolvers/query.go
+++ b/internal/graph/resolvers/query.go
@@ -24,7 +24,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kunstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/crossplane/crossplane-runtime/pkg/errors"
@@ -322,7 +322,7 @@ func (r *query) ProviderRevisions(ctx context.Context, provider *model.Reference
 		}
 
 		// We only want the active PackageRevision, and this isn't it.
-		if pointer.BoolDeref(active, false) && pr.Spec.DesiredState != pkgv1.PackageRevisionActive {
+		if ptr.Deref(active, false) && pr.Spec.DesiredState != pkgv1.PackageRevisionActive {
 			continue
 		}
 
@@ -431,7 +431,7 @@ func (r *query) ConfigurationRevisions(ctx context.Context, configuration *model
 		}
 
 		// We only want the active PackageRevision, and this isn't it.
-		if pointer.BoolDeref(active, false) && pr.Spec.DesiredState != pkgv1.PackageRevisionActive {
+		if ptr.Deref(active, false) && pr.Spec.DesiredState != pkgv1.PackageRevisionActive {
 			continue
 		}
 
@@ -468,7 +468,7 @@ func (r *query) CompositeResourceDefinitions(ctx context.Context, revision *mode
 		xrd := &in.Items[i]
 
 		// We only want dangling XRDs but this one is owned by a config revision.
-		if pointer.BoolDeref(dangling, false) && containsCR(xrd.GetOwnerReferences()) {
+		if ptr.Deref(dangling, false) && containsCR(xrd.GetOwnerReferences()) {
 			continue
 		}
 
@@ -510,7 +510,7 @@ func (r *query) Compositions(ctx context.Context, revision *model.ReferenceID, d
 		cmp := &in.Items[i]
 
 		// We only want dangling XRs but this one is owned by a config revision.
-		if pointer.BoolDeref(dangling, false) && containsCR(cmp.GetOwnerReferences()) {
+		if ptr.Deref(dangling, false) && containsCR(cmp.GetOwnerReferences()) {
 			continue
 		}
 
diff --git a/internal/graph/resolvers/query_test.go b/internal/graph/resolvers/query_test.go
index bd33a29..539ee82 100644
--- a/internal/graph/resolvers/query_test.go
+++ b/internal/graph/resolvers/query_test.go
@@ -24,7 +24,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -77,7 +77,7 @@ func TestCrossplaneResourceTree(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -265,7 +265,7 @@ func TestQueryKubernetesResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -281,7 +281,7 @@ func TestQueryKubernetesResource(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetResource).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetResource)),
 				},
 			},
 		},
@@ -369,7 +369,7 @@ func TestQueryKubernetesResources(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -385,7 +385,7 @@ func TestQueryKubernetesResources(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListResources).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListResources)),
 				},
 			},
 		},
@@ -544,7 +544,7 @@ func TestQuerySecret(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -560,7 +560,7 @@ func TestQuerySecret(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetSecret).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetSecret)),
 				},
 			},
 		},
@@ -634,7 +634,7 @@ func TestQueryConfigMap(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -650,7 +650,7 @@ func TestQueryConfigMap(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetConfigMap).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetConfigMap)),
 				},
 			},
 		},
@@ -723,7 +723,7 @@ func TestQueryProviders(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -739,7 +739,7 @@ func TestQueryProviders(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListProviders).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListProviders)),
 				},
 			},
 		},
@@ -864,7 +864,7 @@ func TestQueryProviderRevisions(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -880,7 +880,7 @@ func TestQueryProviderRevisions(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListProviderRevs).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListProviderRevs)),
 				},
 			},
 		},
@@ -943,7 +943,7 @@ func TestQueryProviderRevisions(t *testing.T) {
 			}),
 			args: args{
 				ctx:    graphql.WithResponseContext(context.Background(), graphql.DefaultErrorPresenter, graphql.DefaultRecover),
-				active: pointer.Bool(true),
+				active: ptr.To(true),
 			},
 			want: want{
 				pc: model.ProviderRevisionConnection{
@@ -1043,7 +1043,7 @@ func TestQueryCustomResourceDefinitions(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -1059,7 +1059,7 @@ func TestQueryCustomResourceDefinitions(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListConfigs).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListConfigs)),
 				},
 			},
 		},
@@ -1177,7 +1177,7 @@ func TestQueryConfigurations(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -1193,7 +1193,7 @@ func TestQueryConfigurations(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListConfigs).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListConfigs)),
 				},
 			},
 		},
@@ -1318,7 +1318,7 @@ func TestQueryConfigurationRevisions(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -1334,7 +1334,7 @@ func TestQueryConfigurationRevisions(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListConfigRevs).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListConfigRevs)),
 				},
 			},
 		},
@@ -1397,7 +1397,7 @@ func TestQueryConfigurationRevisions(t *testing.T) {
 			}),
 			args: args{
 				ctx:    graphql.WithResponseContext(context.Background(), graphql.DefaultErrorPresenter, graphql.DefaultRecover),
-				active: pointer.Bool(true),
+				active: ptr.To(true),
 			},
 			want: want{
 				pc: model.ConfigurationRevisionConnection{
@@ -1496,7 +1496,7 @@ func TestQueryCompositeResourceDefinitions(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -1512,7 +1512,7 @@ func TestQueryCompositeResourceDefinitions(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListConfigs).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListConfigs)),
 				},
 			},
 		},
@@ -1561,7 +1561,7 @@ func TestQueryCompositeResourceDefinitions(t *testing.T) {
 			}),
 			args: args{
 				ctx:      graphql.WithResponseContext(context.Background(), graphql.DefaultErrorPresenter, graphql.DefaultRecover),
-				dangling: pointer.Bool(true),
+				dangling: ptr.To(true),
 			},
 			want: want{
 				xrdc: model.CompositeResourceDefinitionConnection{
@@ -1691,7 +1691,7 @@ func TestQueryCompositions(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errGetClient).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errGetClient)),
 				},
 			},
 		},
@@ -1707,7 +1707,7 @@ func TestQueryCompositions(t *testing.T) {
 			},
 			want: want{
 				errs: gqlerror.List{
-					gqlerror.Errorf(errors.Wrap(errBoom, errListConfigs).Error()),
+					gqlerror.Wrap(errors.Wrap(errBoom, errListConfigs)),
 				},
 			},
 		},
@@ -1756,7 +1756,7 @@ func TestQueryCompositions(t *testing.T) {
 			}),
 			args: args{
 				ctx:      graphql.WithResponseContext(context.Background(), graphql.DefaultErrorPresenter, graphql.DefaultRecover),
-				dangling: pointer.Bool(true),
+				dangling: ptr.To(true),
 			},
 			want: want{
 				cc: model.CompositionConnection{