diff --git a/cli/command/stack/kubernetes/cli.go b/cli/command/stack/kubernetes/cli.go
index f1a54f16a6..f98b4c4f3a 100644
--- a/cli/command/stack/kubernetes/cli.go
+++ b/cli/command/stack/kubernetes/cli.go
@@ -7,8 +7,8 @@ import (
 	"os"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/kubernetes"
-	cliv1beta1 "github.com/docker/cli/kubernetes/client/clientset/typed/compose/v1beta1"
+	kubernetes "github.com/docker/compose-on-kubernetes/api"
+	cliv1beta1 "github.com/docker/compose-on-kubernetes/api/client/clientset/typed/compose/v1beta1"
 	"github.com/pkg/errors"
 	flag "github.com/spf13/pflag"
 	kubeclient "k8s.io/client-go/kubernetes"
diff --git a/cli/command/stack/kubernetes/client.go b/cli/command/stack/kubernetes/client.go
index 5024c92341..10b61210f0 100644
--- a/cli/command/stack/kubernetes/client.go
+++ b/cli/command/stack/kubernetes/client.go
@@ -1,7 +1,7 @@
 package kubernetes
 
 import (
-	"github.com/docker/cli/kubernetes"
+	kubernetes "github.com/docker/compose-on-kubernetes/api"
 	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubeclient "k8s.io/client-go/kubernetes"
diff --git a/cli/command/stack/kubernetes/conversion.go b/cli/command/stack/kubernetes/conversion.go
index cccfd88f8e..e1fdec7174 100644
--- a/cli/command/stack/kubernetes/conversion.go
+++ b/cli/command/stack/kubernetes/conversion.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/docker/cli/cli/command/service"
-	"github.com/docker/cli/kubernetes/labels"
+	"github.com/docker/compose-on-kubernetes/api/labels"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
 	appsv1beta2 "k8s.io/api/apps/v1beta2"
diff --git a/cli/command/stack/kubernetes/conversion_test.go b/cli/command/stack/kubernetes/conversion_test.go
index 8545adaa39..3a5bd962c4 100644
--- a/cli/command/stack/kubernetes/conversion_test.go
+++ b/cli/command/stack/kubernetes/conversion_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/docker/cli/cli/command/service"
-	"github.com/docker/cli/kubernetes/labels"
+	"github.com/docker/compose-on-kubernetes/api/labels"
 	"github.com/docker/docker/api/types/swarm"
 	"gotest.tools/assert"
 	appsv1beta2 "k8s.io/api/apps/v1beta2"
diff --git a/cli/command/stack/kubernetes/convert.go b/cli/command/stack/kubernetes/convert.go
index 6c842df2b7..c76be93cad 100644
--- a/cli/command/stack/kubernetes/convert.go
+++ b/cli/command/stack/kubernetes/convert.go
@@ -11,8 +11,8 @@ import (
 	"github.com/docker/cli/cli/compose/schema"
 	composeTypes "github.com/docker/cli/cli/compose/types"
 	composetypes "github.com/docker/cli/cli/compose/types"
-	"github.com/docker/cli/kubernetes/compose/v1beta1"
-	"github.com/docker/cli/kubernetes/compose/v1beta2"
+	"github.com/docker/compose-on-kubernetes/api/compose/v1beta1"
+	"github.com/docker/compose-on-kubernetes/api/compose/v1beta2"
 	"github.com/pkg/errors"
 	yaml "gopkg.in/yaml.v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/cli/command/stack/kubernetes/services.go b/cli/command/stack/kubernetes/services.go
index d237e79728..8f91b7e279 100644
--- a/cli/command/stack/kubernetes/services.go
+++ b/cli/command/stack/kubernetes/services.go
@@ -7,7 +7,7 @@ import (
 	"github.com/docker/cli/cli/command/service"
 	"github.com/docker/cli/cli/command/stack/formatter"
 	"github.com/docker/cli/cli/command/stack/options"
-	"github.com/docker/cli/kubernetes/labels"
+	"github.com/docker/compose-on-kubernetes/api/labels"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
 	appsv1beta2 "k8s.io/api/apps/v1beta2"
diff --git a/cli/command/stack/kubernetes/stack.go b/cli/command/stack/kubernetes/stack.go
index 67d1af689f..8a252800e0 100644
--- a/cli/command/stack/kubernetes/stack.go
+++ b/cli/command/stack/kubernetes/stack.go
@@ -5,8 +5,8 @@ import (
 	"path/filepath"
 	"sort"
 
-	"github.com/docker/cli/kubernetes/compose/v1beta2"
-	"github.com/docker/cli/kubernetes/labels"
+	"github.com/docker/compose-on-kubernetes/api/compose/v1beta2"
+	"github.com/docker/compose-on-kubernetes/api/labels"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
diff --git a/cli/command/stack/kubernetes/stackclient.go b/cli/command/stack/kubernetes/stackclient.go
index 73131e2f3c..0a10c7d536 100644
--- a/cli/command/stack/kubernetes/stackclient.go
+++ b/cli/command/stack/kubernetes/stackclient.go
@@ -3,9 +3,9 @@ package kubernetes
 import (
 	"fmt"
 
-	composev1beta1 "github.com/docker/cli/kubernetes/client/clientset/typed/compose/v1beta1"
-	composev1beta2 "github.com/docker/cli/kubernetes/client/clientset/typed/compose/v1beta2"
-	"github.com/docker/cli/kubernetes/labels"
+	composev1beta1 "github.com/docker/compose-on-kubernetes/api/client/clientset/typed/compose/v1beta1"
+	composev1beta2 "github.com/docker/compose-on-kubernetes/api/client/clientset/typed/compose/v1beta2"
+	"github.com/docker/compose-on-kubernetes/api/labels"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/rest"
diff --git a/cli/command/stack/kubernetes/watcher.go b/cli/command/stack/kubernetes/watcher.go
index 93d3358b4b..0a7887a8a2 100644
--- a/cli/command/stack/kubernetes/watcher.go
+++ b/cli/command/stack/kubernetes/watcher.go
@@ -5,8 +5,8 @@ import (
 	"sync"
 	"time"
 
-	apiv1beta1 "github.com/docker/cli/kubernetes/compose/v1beta1"
-	"github.com/docker/cli/kubernetes/labels"
+	apiv1beta1 "github.com/docker/compose-on-kubernetes/api/compose/v1beta1"
+	"github.com/docker/compose-on-kubernetes/api/labels"
 	"github.com/pkg/errors"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/cli/command/stack/kubernetes/watcher_test.go b/cli/command/stack/kubernetes/watcher_test.go
index 84e51ea3b3..0972a91461 100644
--- a/cli/command/stack/kubernetes/watcher_test.go
+++ b/cli/command/stack/kubernetes/watcher_test.go
@@ -3,8 +3,8 @@ package kubernetes
 import (
 	"testing"
 
-	apiv1beta1 "github.com/docker/cli/kubernetes/compose/v1beta1"
-	composelabels "github.com/docker/cli/kubernetes/labels"
+	apiv1beta1 "github.com/docker/compose-on-kubernetes/api/compose/v1beta1"
+	composelabels "github.com/docker/compose-on-kubernetes/api/labels"
 	"gotest.tools/assert"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/cli/command/system/version.go b/cli/command/system/version.go
index 7593b11b81..97c50f1bdc 100644
--- a/cli/command/system/version.go
+++ b/cli/command/system/version.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/kubernetes"
 	"github.com/docker/cli/templates"
+	kubernetes "github.com/docker/compose-on-kubernetes/api"
 	"github.com/docker/docker/api/types"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"