diff --git a/server/container_list.go b/server/container_list.go
index 7669c4bf..fee3219d 100644
--- a/server/container_list.go
+++ b/server/container_list.go
@@ -4,8 +4,8 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/kubernetes-incubator/cri-o/oci"
 	"golang.org/x/net/context"
+	"k8s.io/apimachinery/pkg/fields"
 	pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
-	"k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/fields"
 )
 
 // filterContainer returns whether passed container matches filtering criteria
diff --git a/server/sandbox_list.go b/server/sandbox_list.go
index 7ec0141f..51ec1d25 100644
--- a/server/sandbox_list.go
+++ b/server/sandbox_list.go
@@ -4,8 +4,8 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/kubernetes-incubator/cri-o/oci"
 	"golang.org/x/net/context"
+	"k8s.io/apimachinery/pkg/fields"
 	pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
-	"k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/fields"
 )
 
 // filterSandbox returns whether passed container matches filtering criteria