diff --git a/pkg/handlers/generic/lifecycle/utils/secrets_test.go b/pkg/handlers/generic/lifecycle/utils/secrets_test.go
index e2aee0bc1..9c5a4eb55 100644
--- a/pkg/handlers/generic/lifecycle/utils/secrets_test.go
+++ b/pkg/handlers/generic/lifecycle/utils/secrets_test.go
@@ -104,7 +104,12 @@ func Test_EnsureOwnerRefForSecret(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
-			err := EnsureOwnerRefForSecret(context.Background(), tt.client, tt.secretName, tt.cluster)
+			err := EnsureOwnerRefForSecret(
+				context.Background(),
+				tt.client,
+				tt.secretName,
+				tt.cluster,
+			)
 			require.Equal(t, tt.wantErr, err)
 			if tt.wantErr != nil {
 				return
@@ -116,7 +121,7 @@ func Test_EnsureOwnerRefForSecret(t *testing.T) {
 				client.ObjectKey{Namespace: tt.cluster.Namespace, Name: tt.secretName},
 				secret,
 			)
-			assert.NoError(t, err, "failed to get updated secret")
+			require.NoError(t, err, "failed to get updated secret")
 			assert.Len(t, secret.OwnerReferences, tt.wantOwnerRefs)
 		})
 	}
diff --git a/pkg/handlers/nutanix/mutation/machinedetails/inject.go b/pkg/handlers/nutanix/mutation/machinedetails/inject.go
index 41fa11360..77ae20f5e 100644
--- a/pkg/handlers/nutanix/mutation/machinedetails/inject.go
+++ b/pkg/handlers/nutanix/mutation/machinedetails/inject.go
@@ -5,10 +5,10 @@ package machinedetails
 
 import (
 	"context"
+	"slices"
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/utils/ptr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -101,30 +101,12 @@ func (h *nutanixMachineDetailsPatchHandler) Mutate(
 			spec.MemorySize = nutanixMachineDetailsVar.MemorySize
 			spec.SystemDiskSize = nutanixMachineDetailsVar.SystemDiskSize
 
-			spec.Subnets = make(
-				[]capxv1.NutanixResourceIdentifier,
-				len(nutanixMachineDetailsVar.Subnets),
-			)
-
-			copy(spec.Subnets, nutanixMachineDetailsVar.Subnets)
-
-			spec.AdditionalCategories = make(
-				[]capxv1.NutanixCategoryIdentifier,
-				len(nutanixMachineDetailsVar.AdditionalCategories),
-			)
-
-			copy(spec.AdditionalCategories, nutanixMachineDetailsVar.AdditionalCategories)
-
-			if nutanixMachineDetailsVar.Project != nil {
-				spec.Project = ptr.To(
-					*nutanixMachineDetailsVar.Project,
-				)
-			}
-			spec.GPUs = make(
-				[]capxv1.NutanixGPU,
-				len(nutanixMachineDetailsVar.GPUs),
-			)
-			copy(spec.GPUs, nutanixMachineDetailsVar.GPUs)
+			spec.Subnets = slices.Clone(nutanixMachineDetailsVar.Subnets)
+			spec.AdditionalCategories = slices.Clone(nutanixMachineDetailsVar.AdditionalCategories)
+			spec.GPUs = slices.Clone(nutanixMachineDetailsVar.GPUs)
+
+			spec.Project = nutanixMachineDetailsVar.Project.DeepCopy()
+
 			obj.Spec.Template.Spec = spec
 			return nil
 		},