diff --git a/pkg/config/config_unix.go b/pkg/config/config_unix.go
index 77c9b2d93..5fa869a54 100644
--- a/pkg/config/config_unix.go
+++ b/pkg/config/config_unix.go
@@ -20,7 +20,7 @@ package config
 
 import (
 	"github.com/containerd/containerd"
-	"k8s.io/kubernetes/pkg/kubelet/cri/streaming"
+	"github.com/containerd/cri/pkg/streaming"
 )
 
 // DefaultConfig returns default configurations of cri plugin.
diff --git a/pkg/config/config_windows.go b/pkg/config/config_windows.go
index 737b66e7a..9f8378678 100644
--- a/pkg/config/config_windows.go
+++ b/pkg/config/config_windows.go
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 
 	"github.com/containerd/containerd"
-	"k8s.io/kubernetes/pkg/kubelet/cri/streaming"
+	"github.com/containerd/cri/pkg/streaming"
 )
 
 // DefaultConfig returns default configurations of cri plugin.
diff --git a/pkg/server/service.go b/pkg/server/service.go
index bc22d3a5b..94e02591a 100644
--- a/pkg/server/service.go
+++ b/pkg/server/service.go
@@ -28,12 +28,12 @@ import (
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/oci"
 	"github.com/containerd/containerd/plugin"
+	"github.com/containerd/cri/pkg/streaming"
 	cni "github.com/containerd/go-cni"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
-	"k8s.io/kubernetes/pkg/kubelet/cri/streaming"
 
 	"github.com/containerd/cri/pkg/store/label"
 
diff --git a/pkg/server/streaming.go b/pkg/server/streaming.go
index 7c5ecf04f..d0089cc89 100644
--- a/pkg/server/streaming.go
+++ b/pkg/server/streaming.go
@@ -30,10 +30,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/tools/remotecommand"
 	k8scert "k8s.io/client-go/util/cert"
-	"k8s.io/kubernetes/pkg/kubelet/cri/streaming"
 	"k8s.io/utils/exec"
 
 	ctrdutil "github.com/containerd/cri/pkg/containerd/util"
+	"github.com/containerd/cri/pkg/streaming"
 )
 
 type streamListenerMode int
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/errors.go b/pkg/streaming/errors.go
similarity index 100%
rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/errors.go
rename to pkg/streaming/errors.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/constants.go b/pkg/streaming/portforward/constants.go
similarity index 100%
rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/constants.go
rename to pkg/streaming/portforward/constants.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/httpstream.go b/pkg/streaming/portforward/httpstream.go
similarity index 100%
rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/httpstream.go
rename to pkg/streaming/portforward/httpstream.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/portforward.go b/pkg/streaming/portforward/portforward.go
similarity index 100%
rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/portforward.go
rename to pkg/streaming/portforward/portforward.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/websocket.go b/pkg/streaming/portforward/websocket.go
similarity index 100%
rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/websocket.go
rename to pkg/streaming/portforward/websocket.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/attach.go b/pkg/streaming/remotecommand/attach.go
similarity index 100%
rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/attach.go
rename to pkg/streaming/remotecommand/attach.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/doc.go b/pkg/streaming/remotecommand/doc.go
similarity index 100%
rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/doc.go
rename to pkg/streaming/remotecommand/doc.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/exec.go b/pkg/streaming/remotecommand/exec.go
similarity index 100%
rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/exec.go
rename to pkg/streaming/remotecommand/exec.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/httpstream.go b/pkg/streaming/remotecommand/httpstream.go
similarity index 100%
rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/httpstream.go
rename to pkg/streaming/remotecommand/httpstream.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/websocket.go b/pkg/streaming/remotecommand/websocket.go
similarity index 100%
rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/websocket.go
rename to pkg/streaming/remotecommand/websocket.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/request_cache.go b/pkg/streaming/request_cache.go
similarity index 100%
rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/request_cache.go
rename to pkg/streaming/request_cache.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/server.go b/pkg/streaming/server.go
similarity index 98%
rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/server.go
rename to pkg/streaming/server.go
index d5cacbbf7..8cdb0fda5 100644
--- a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/server.go
+++ b/pkg/streaming/server.go
@@ -35,8 +35,9 @@ import (
 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand"
 	"k8s.io/client-go/tools/remotecommand"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
-	"k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward"
-	remotecommandserver "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand"
+
+	"github.com/containerd/cri/pkg/streaming/portforward"
+	remotecommandserver "github.com/containerd/cri/pkg/streaming/remotecommand"
 )
 
 // Server is the library interface to serve the stream requests.