diff --git a/pkg/client/cluster.go b/pkg/client/cluster.go
index e4e8900f..f376b9f5 100644
--- a/pkg/client/cluster.go
+++ b/pkg/client/cluster.go
@@ -298,6 +298,7 @@ func ClusterPrepImageVolume(ctx context.Context, runtime k3drt.Runtime, cluster
 	}
 
 	clusterCreateOpts.GlobalLabels[k3d.LabelImageVolume] = imageVolumeName
+	cluster.ImageVolume = imageVolumeName
 
 	// attach volume to nodes
 	for _, node := range cluster.Nodes {
diff --git a/pkg/client/tools.go b/pkg/client/tools.go
index 7598a1db..8e1dd503 100644
--- a/pkg/client/tools.go
+++ b/pkg/client/tools.go
@@ -268,7 +268,7 @@ func EnsureToolsNode(ctx context.Context, runtime runtimes.Runtime, cluster *k3d
 			var err error
 			cluster, err = ClusterGet(ctx, runtime, cluster)
 			if err != nil {
-				return nil, fmt.Errorf("failed to retrieve cluster '%s': %w", cluster.Name, err)
+				return nil, fmt.Errorf("failed to retrieve cluster: %w", err)
 			}
 
 			if cluster.Network.Name == "" {