diff --git a/components/image-builder-bob/pkg/builder/builder.go b/components/image-builder-bob/pkg/builder/builder.go
index bfdcbd8e236f6e..5df155511fcf39 100644
--- a/components/image-builder-bob/pkg/builder/builder.go
+++ b/components/image-builder-bob/pkg/builder/builder.go
@@ -24,8 +24,10 @@ import (
 )
 
 const (
-	buildkitdSocketPath      = "unix:///run/buildkit/buildkitd.sock"
-	maxConnectionAttempts    = 10
+	buildkitdSocketPath = "unix:///run/buildkit/buildkitd.sock"
+	// maxConnectionAttempts is the number of attempts to try to connect to the buildkit daemon.
+	// Uses exponential backoff to retry. 8 attempts is a bit over 4 minutes.
+	maxConnectionAttempts    = 8
 	initialConnectionTimeout = 2 * time.Second
 )
 
@@ -258,11 +260,12 @@ func connectToBuildkitd(socketPath string) (cl *client.Client, err error) {
 		log.WithField("attempt", i).Debug("attempting to connect to buildkitd")
 		cl, err = client.New(ctx, socketPath, client.WithFailFast())
 		if err != nil {
+			cancel()
 			if i == maxConnectionAttempts-1 {
 				log.WithField("attempt", i).WithError(err).Warn("cannot connect to buildkitd")
+				break
 			}
 
-			cancel()
 			time.Sleep(backoff)
 			backoff = 2 * backoff
 			continue
@@ -270,11 +273,12 @@ func connectToBuildkitd(socketPath string) (cl *client.Client, err error) {
 
 		_, err = cl.ListWorkers(ctx)
 		if err != nil {
+			cancel()
 			if i == maxConnectionAttempts-1 {
 				log.WithField("attempt", i).WithError(err).Error("cannot connect to buildkitd")
+				break
 			}
 
-			cancel()
 			time.Sleep(backoff)
 			backoff = 2 * backoff
 			continue
diff --git a/test/pkg/integration/integration.go b/test/pkg/integration/integration.go
index 534d8023e27ccf..81981945bdae5e 100644
--- a/test/pkg/integration/integration.go
+++ b/test/pkg/integration/integration.go
@@ -506,9 +506,7 @@ const (
 	ComponentContentService ComponentType = "content-service"
 	// ComponentWorkspace points to a workspace
 	ComponentWorkspace ComponentType = "workspace"
-	// ComponentImageBuilder points to the image-builder
-	ComponentImageBuilder ComponentType = "image-builder"
-	// ComponentImageBuilder points to the image-builder-mk3
+	// ComponentImageBuilderMK3 points to the image-builder-mk3
 	ComponentImageBuilderMK3 ComponentType = "image-builder-mk3"
 )