diff --git a/aci/aci.go b/aci/aci.go
index fee06459f..7478b9789 100644
--- a/aci/aci.go
+++ b/aci/aci.go
@@ -39,8 +39,8 @@ import (
 	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/api/containers"
 	"github.com/docker/compose-cli/api/context/store"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/api/progress"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) error {
diff --git a/aci/compose.go b/aci/compose.go
index d72fb56e9..60a42b170 100644
--- a/aci/compose.go
+++ b/aci/compose.go
@@ -28,7 +28,7 @@ import (
 	"github.com/docker/compose-cli/aci/login"
 	"github.com/docker/compose-cli/api/compose"
 	"github.com/docker/compose-cli/api/context/store"
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/utils/formatter"
 )
 
diff --git a/aci/containers.go b/aci/containers.go
index 8c77f83bb..0425c5837 100644
--- a/aci/containers.go
+++ b/aci/containers.go
@@ -33,7 +33,7 @@ import (
 	"github.com/docker/compose-cli/aci/login"
 	"github.com/docker/compose-cli/api/containers"
 	"github.com/docker/compose-cli/api/context/store"
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 )
 
 type aciContainerService struct {
diff --git a/aci/context.go b/aci/context.go
index 2181c6536..7f9cdb4c2 100644
--- a/aci/context.go
+++ b/aci/context.go
@@ -28,7 +28,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/docker/compose-cli/api/context/store"
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/utils/prompt"
 )
 
diff --git a/aci/convert/volume.go b/aci/convert/volume.go
index c64aa53b6..3c3e0dd44 100644
--- a/aci/convert/volume.go
+++ b/aci/convert/volume.go
@@ -30,7 +30,7 @@ import (
 	"github.com/compose-spec/compose-go/types"
 
 	"github.com/docker/compose-cli/aci/login"
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 )
 
 const (
diff --git a/aci/login/client.go b/aci/login/client.go
index 635288b3e..55b2fb979 100644
--- a/aci/login/client.go
+++ b/aci/login/client.go
@@ -26,7 +26,7 @@ import (
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/pkg/errors"
 
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/internal"
 )
 
diff --git a/aci/login/login.go b/aci/login/login.go
index 9c99bcb88..21cb30fcd 100644
--- a/aci/login/login.go
+++ b/aci/login/login.go
@@ -33,7 +33,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
 
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 )
 
 //go login process, derived from code sample provided by MS at https://github.com/devigned/go-az-cli-stuff
diff --git a/aci/volumes.go b/aci/volumes.go
index 3eebfb287..caa2bc0fa 100644
--- a/aci/volumes.go
+++ b/aci/volumes.go
@@ -30,9 +30,9 @@ import (
 
 	"github.com/docker/compose-cli/aci/login"
 	"github.com/docker/compose-cli/api/context/store"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/api/progress"
 	"github.com/docker/compose-cli/api/volumes"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 type aciVolumeService struct {
diff --git a/api/backend/backend.go b/api/backend/backend.go
index b5b575b7e..b1aa3eadc 100644
--- a/api/backend/backend.go
+++ b/api/backend/backend.go
@@ -26,10 +26,10 @@ import (
 	"github.com/docker/compose-cli/api/cloud"
 	"github.com/docker/compose-cli/api/compose"
 	"github.com/docker/compose-cli/api/containers"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/api/resources"
 	"github.com/docker/compose-cli/api/secrets"
 	"github.com/docker/compose-cli/api/volumes"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 var (
diff --git a/api/client/compose.go b/api/client/compose.go
index 0c6211230..072b06b99 100644
--- a/api/client/compose.go
+++ b/api/client/compose.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	"github.com/docker/compose-cli/api/compose"
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 
 	"github.com/compose-spec/compose-go/types"
 )
diff --git a/api/client/containers.go b/api/client/containers.go
index efa395372..1b1e665b8 100644
--- a/api/client/containers.go
+++ b/api/client/containers.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	"github.com/docker/compose-cli/api/containers"
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 )
 
 type containerService struct {
diff --git a/api/client/resources.go b/api/client/resources.go
index cefb6c48e..04b74219f 100644
--- a/api/client/resources.go
+++ b/api/client/resources.go
@@ -19,8 +19,8 @@ package client
 import (
 	"context"
 
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/api/resources"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 type resourceService struct {
diff --git a/api/client/secrets.go b/api/client/secrets.go
index 8c2debd23..a263e5fde 100644
--- a/api/client/secrets.go
+++ b/api/client/secrets.go
@@ -19,8 +19,8 @@ package client
 import (
 	"context"
 
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/api/secrets"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 type secretsService struct {
diff --git a/api/client/volume.go b/api/client/volume.go
index 23d99c3d7..aa359754d 100644
--- a/api/client/volume.go
+++ b/api/client/volume.go
@@ -19,8 +19,8 @@ package client
 import (
 	"context"
 
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/api/volumes"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 type volumeService struct {
diff --git a/api/cloud/api.go b/api/cloud/api.go
index 475599d39..aa8b7773c 100644
--- a/api/cloud/api.go
+++ b/api/cloud/api.go
@@ -19,7 +19,7 @@ package cloud
 import (
 	"context"
 
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 )
 
 // Service cloud specific services
diff --git a/api/context/store/store.go b/api/context/store/store.go
index 917f282ec..78b512ea5 100644
--- a/api/context/store/store.go
+++ b/api/context/store/store.go
@@ -28,7 +28,7 @@ import (
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
 
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 )
 
 const (
diff --git a/api/context/store/store_test.go b/api/context/store/store_test.go
index 29b814f18..97e7613e1 100644
--- a/api/context/store/store_test.go
+++ b/api/context/store/store_test.go
@@ -25,7 +25,7 @@ import (
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/assert/cmp"
 
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 )
 
 func testStore(t *testing.T) Store {
diff --git a/errdefs/errors.go b/api/errdefs/errors.go
similarity index 100%
rename from errdefs/errors.go
rename to api/errdefs/errors.go
diff --git a/errdefs/errors_test.go b/api/errdefs/errors_test.go
similarity index 100%
rename from errdefs/errors_test.go
rename to api/errdefs/errors_test.go
diff --git a/cli/cmd/context/create_aci.go b/cli/cmd/context/create_aci.go
index d30659302..0c6f7c41c 100644
--- a/cli/cmd/context/create_aci.go
+++ b/cli/cmd/context/create_aci.go
@@ -25,7 +25,7 @@ import (
 	"github.com/docker/compose-cli/aci"
 	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/api/context/store"
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 )
 
 func init() {
diff --git a/cli/cmd/context/create_ecs.go b/cli/cmd/context/create_ecs.go
index 419ce7816..34ba11c42 100644
--- a/cli/cmd/context/create_ecs.go
+++ b/cli/cmd/context/create_ecs.go
@@ -28,8 +28,8 @@ import (
 
 	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/api/context/store"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/ecs"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 func init() {
diff --git a/cli/cmd/context/update.go b/cli/cmd/context/update.go
index 7b54bff9f..f21182b47 100644
--- a/cli/cmd/context/update.go
+++ b/cli/cmd/context/update.go
@@ -21,8 +21,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/context/store"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/cli/mobycli"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 func updateCommand() *cobra.Command {
diff --git a/cli/cmd/kill.go b/cli/cmd/kill.go
index 9b14f7fec..0de597d77 100644
--- a/cli/cmd/kill.go
+++ b/cli/cmd/kill.go
@@ -25,8 +25,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/cli/formatter"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 type killOpts struct {
diff --git a/cli/cmd/login/login.go b/cli/cmd/login/login.go
index 78cc0a995..7163dc965 100644
--- a/cli/cmd/login/login.go
+++ b/cli/cmd/login/login.go
@@ -24,9 +24,9 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/cli/cmd/mobyflags"
 	"github.com/docker/compose-cli/cli/mobycli"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 // Command returns the login command
diff --git a/cli/cmd/logout/azure.go b/cli/cmd/logout/azure.go
index 1f0ca0390..2c209a496 100644
--- a/cli/cmd/logout/azure.go
+++ b/cli/cmd/logout/azure.go
@@ -24,7 +24,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 )
 
 // AzureLogoutCommand returns the azure logout command
diff --git a/cli/cmd/rm.go b/cli/cmd/rm.go
index 5a8245131..0f38f8c7d 100644
--- a/cli/cmd/rm.go
+++ b/cli/cmd/rm.go
@@ -26,8 +26,8 @@ import (
 
 	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/api/containers"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/cli/formatter"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 type rmOpts struct {
diff --git a/cli/cmd/start.go b/cli/cmd/start.go
index 14fb009d0..32e231124 100644
--- a/cli/cmd/start.go
+++ b/cli/cmd/start.go
@@ -25,8 +25,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/cli/formatter"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 // StartCommand starts containers
diff --git a/cli/cmd/stop.go b/cli/cmd/stop.go
index 219c8e728..460a301bf 100644
--- a/cli/cmd/stop.go
+++ b/cli/cmd/stop.go
@@ -25,8 +25,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/cli/formatter"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 type stopOpts struct {
diff --git a/cli/formatter/formatter.go b/cli/formatter/formatter.go
index 4f8df5369..b1472024a 100644
--- a/cli/formatter/formatter.go
+++ b/cli/formatter/formatter.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 )
 
 // Print prints formatted lists in different formats
diff --git a/cli/main.go b/cli/main.go
index 1533d5e8b..35e103cb1 100644
--- a/cli/main.go
+++ b/cli/main.go
@@ -34,6 +34,7 @@ import (
 
 	apicontext "github.com/docker/compose-cli/api/context"
 	"github.com/docker/compose-cli/api/context/store"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/cli/cmd"
 	"github.com/docker/compose-cli/cli/cmd/compose"
 	contextcmd "github.com/docker/compose-cli/cli/cmd/context"
@@ -45,7 +46,6 @@ import (
 	"github.com/docker/compose-cli/cli/mobycli"
 	cliopts "github.com/docker/compose-cli/cli/options"
 	"github.com/docker/compose-cli/config"
-	"github.com/docker/compose-cli/errdefs"
 
 	// Backend registrations
 	_ "github.com/docker/compose-cli/aci"
diff --git a/cli/server/metrics_test.go b/cli/server/metrics_test.go
index a3f81e1e5..498ef5e35 100644
--- a/cli/server/metrics_test.go
+++ b/cli/server/metrics_test.go
@@ -31,6 +31,7 @@ import (
 	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/api/compose"
 	"github.com/docker/compose-cli/api/containers"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/api/secrets"
 	"github.com/docker/compose-cli/api/volumes"
 	"github.com/docker/compose-cli/cli/metrics"
@@ -40,7 +41,6 @@ import (
 	streamsv1 "github.com/docker/compose-cli/cli/server/protos/streams/v1"
 	volumesv1 "github.com/docker/compose-cli/cli/server/protos/volumes/v1"
 	"github.com/docker/compose-cli/cli/server/proxy"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 func TestAllMethodsHaveCorrespondingCliCommand(t *testing.T) {
diff --git a/ecs/awsResources.go b/ecs/awsResources.go
index 0ab601465..71d9d477e 100644
--- a/ecs/awsResources.go
+++ b/ecs/awsResources.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	"github.com/docker/compose-cli/api/compose"
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 
 	"github.com/aws/aws-sdk-go/aws/arn"
 	"github.com/aws/aws-sdk-go/service/elbv2"
diff --git a/ecs/backend.go b/ecs/backend.go
index cd6dc06d5..bb075b4cc 100644
--- a/ecs/backend.go
+++ b/ecs/backend.go
@@ -27,10 +27,10 @@ import (
 	"github.com/docker/compose-cli/api/containers"
 	apicontext "github.com/docker/compose-cli/api/context"
 	"github.com/docker/compose-cli/api/context/store"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/api/resources"
 	"github.com/docker/compose-cli/api/secrets"
 	"github.com/docker/compose-cli/api/volumes"
-	"github.com/docker/compose-cli/errdefs"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
diff --git a/ecs/context.go b/ecs/context.go
index fd3dfac99..e1f43f3ea 100644
--- a/ecs/context.go
+++ b/ecs/context.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 
 	"github.com/docker/compose-cli/api/context/store"
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/utils/prompt"
 
 	"github.com/AlecAivazis/survey/v2/terminal"
diff --git a/ecs/local/compose.go b/ecs/local/compose.go
index b534a8193..b20741afe 100644
--- a/ecs/local/compose.go
+++ b/ecs/local/compose.go
@@ -29,7 +29,7 @@ import (
 	"github.com/sanathkr/go-yaml"
 
 	"github.com/docker/compose-cli/api/compose"
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 )
 
 func (e ecsLocalSimulation) Build(ctx context.Context, project *types.Project) error {
diff --git a/ecs/local/context.go b/ecs/local/context.go
index fb6752f49..c623a0f92 100644
--- a/ecs/local/context.go
+++ b/ecs/local/context.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	"github.com/docker/compose-cli/api/cloud"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/ecs"
-	"github.com/docker/compose-cli/errdefs"
 )
 
 var _ cloud.Service = ecsLocalSimulation{}
diff --git a/ecs/run.go b/ecs/run.go
index 13a7f34e5..4699ec411 100644
--- a/ecs/run.go
+++ b/ecs/run.go
@@ -22,7 +22,7 @@ import (
 	"github.com/compose-spec/compose-go/types"
 
 	"github.com/docker/compose-cli/api/compose"
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 )
 
 func (b *ecsAPIService) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) error {
diff --git a/ecs/sdk.go b/ecs/sdk.go
index 1c9fa57d2..92a2b3f26 100644
--- a/ecs/sdk.go
+++ b/ecs/sdk.go
@@ -25,8 +25,8 @@ import (
 	"time"
 
 	"github.com/docker/compose-cli/api/compose"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/api/secrets"
-	"github.com/docker/compose-cli/errdefs"
 	"github.com/docker/compose-cli/internal"
 
 	"github.com/aws/aws-sdk-go/aws"
diff --git a/ecs/up.go b/ecs/up.go
index a47f7adba..6a71b1bfa 100644
--- a/ecs/up.go
+++ b/ecs/up.go
@@ -26,7 +26,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/docker/compose-cli/api/compose"
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 
 	"github.com/compose-spec/compose-go/types"
 )
diff --git a/ecs/volumes.go b/ecs/volumes.go
index 81aefe738..df1a296f4 100644
--- a/ecs/volumes.go
+++ b/ecs/volumes.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 
 	"github.com/docker/compose-cli/api/compose"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/api/volumes"
-	"github.com/docker/compose-cli/errdefs"
 
 	"github.com/awslabs/goformation/v4/cloudformation"
 	"github.com/awslabs/goformation/v4/cloudformation/efs"
diff --git a/example/backend.go b/example/backend.go
index e0f4df489..94427fda5 100644
--- a/example/backend.go
+++ b/example/backend.go
@@ -27,10 +27,10 @@ import (
 	"github.com/docker/compose-cli/api/cloud"
 	"github.com/docker/compose-cli/api/compose"
 	"github.com/docker/compose-cli/api/containers"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/api/resources"
 	"github.com/docker/compose-cli/api/secrets"
 	"github.com/docker/compose-cli/api/volumes"
-	"github.com/docker/compose-cli/errdefs"
 
 	"github.com/compose-spec/compose-go/types"
 )
diff --git a/local/compose/compose.go b/local/compose/compose.go
index 88cb6fc40..894db8fe9 100644
--- a/local/compose/compose.go
+++ b/local/compose/compose.go
@@ -29,7 +29,7 @@ import (
 	"github.com/docker/docker/client"
 	"github.com/sanathkr/go-yaml"
 
-	errdefs2 "github.com/docker/compose-cli/errdefs"
+	errdefs2 "github.com/docker/compose-cli/api/errdefs"
 )
 
 // NewComposeService create a local implementation of the compose.Service API
diff --git a/local/containers.go b/local/containers.go
index 3c6d7e6b3..e3e72d25c 100644
--- a/local/containers.go
+++ b/local/containers.go
@@ -34,7 +34,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/docker/compose-cli/api/containers"
-	"github.com/docker/compose-cli/errdefs"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/local/moby"
 )
 
diff --git a/tests/aci-e2e/e2e-aci_test.go b/tests/aci-e2e/e2e-aci_test.go
index 464be0e2a..0ac81b976 100644
--- a/tests/aci-e2e/e2e-aci_test.go
+++ b/tests/aci-e2e/e2e-aci_test.go
@@ -52,8 +52,8 @@ import (
 	"github.com/docker/compose-cli/aci/login"
 	"github.com/docker/compose-cli/api/containers"
 	"github.com/docker/compose-cli/api/context/store"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/cli/cmd"
-	"github.com/docker/compose-cli/errdefs"
 	. "github.com/docker/compose-cli/tests/framework"
 )