diff --git a/pkg/compose/build.go b/pkg/compose/build.go
index 8a4043a86b9..d404fd0a628 100644
--- a/pkg/compose/build.go
+++ b/pkg/compose/build.go
@@ -172,7 +172,7 @@ func (s *composeService) build(ctx context.Context, project *types.Project, opti
 		if options.Quiet {
 			options.Progress = progress.ModeQuiet
 		}
-		if options.Progress == "" {
+		if options.Progress == progress.ModeAuto {
 			options.Progress = os.Getenv("BUILDKIT_PROGRESS")
 		}
 		w, err = xprogress.NewPrinter(progressCtx, os.Stdout, progressui.DisplayMode(options.Progress),
diff --git a/pkg/compose/logs.go b/pkg/compose/logs.go
index 284068e4cfa..b9a108fc3d3 100644
--- a/pkg/compose/logs.go
+++ b/pkg/compose/logs.go
@@ -18,12 +18,11 @@ package compose
 
 import (
 	"context"
-	"errors"
 	"io"
 	"time"
 
+	"github.com/containerd/errdefs"
 	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sync/errgroup"
@@ -64,8 +63,7 @@ func (s *composeService) Logs(
 	for _, ctr := range containers {
 		eg.Go(func() error {
 			err := s.logContainers(ctx, consumer, ctr, options)
-			var notImplErr errdefs.ErrNotImplemented
-			if errors.As(err, &notImplErr) {
+			if errdefs.IsNotImplemented(err) {
 				logrus.Warnf("Can't retrieve logs for %q: %s", getCanonicalContainerName(ctr), err.Error())
 				return nil
 			}
@@ -106,8 +104,7 @@ func (s *composeService) Logs(
 						Tail:       options.Tail,
 						Timestamps: options.Timestamps,
 					})
-					var notImplErr errdefs.ErrNotImplemented
-					if errors.As(err, &notImplErr) {
+					if errdefs.IsNotImplemented(err) {
 						// ignore
 						return nil
 					}