diff --git a/Makefile b/Makefile
index 6bb59ea96..aa011ad88 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ proto:
 .PHONY: install.deps
 
 install.deps:
-	@./hack/install-deps.sh
+	@./hack/install/install-deps.sh
 
 .PHONY: .gitvalidation
 # When this is running in travis, it will only check the travis commit range.
diff --git a/hack/install-deps.sh b/hack/install-deps.sh
deleted file mode 100755
index 415bcfe7a..000000000
--- a/hack/install-deps.sh
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Dependencies:
-# runc:
-# - libseccomp-dev(Ubuntu,Debian)/libseccomp-devel(Fedora, CentOS, RHEL). Note that
-# libseccomp in ubuntu <=trusty and debian <=jessie is not new enough, backport
-# is required.
-# - libapparmor-dev(Ubuntu,Debian)/libapparmor-devel(Fedora, CentOS, RHEL)
-# containerd:
-# - btrfs-tools(Ubuntu,Debian)/btrfs-progs-devel(Fedora, CentOS, RHEL)
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-source $(dirname "${BASH_SOURCE[0]}")/utils.sh
-
-ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
-
-# DESTDIR is the dest path to install dependencies.
-DESTDIR=${DESTDIR:-"/"}
-# Convert to absolute path if it's relative.
-if [[ ${DESTDIR} != /* ]]; then
-  DESTDIR=${ROOT}/${DESTDIR}
-fi
-
-# NOSUDO indicates not to use sudo during installation.
-NOSUDO=${NOSUDO:-false}
-sudo="sudo"
-if ${NOSUDO}; then
-  sudo=""
-fi
-
-# INSTALL_CNI indicates whether to install CNI. CNI installation
-# makes sense for local testing, but doesn't make sense for cluster
-# setup, because CNI daemonset is usually used to deploy CNI binaries
-# and configurations in cluster.
-INSTALL_CNI=${INSTALL_CNI:-true}
-
-CONTAINERD_DIR=${DESTDIR}/usr/local
-RUNC_DIR=${DESTDIR}
-CNI_DIR=${DESTDIR}/opt/cni
-CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d
-CRICTL_DIR=${DESTDIR}/usr/local/bin
-CRICTL_CONFIG_DIR=${DESTDIR}/etc
-
-RUNC_PKG=github.com/opencontainers/runc
-CNI_PKG=github.com/containernetworking/plugins
-CONTAINERD_PKG=github.com/containerd/containerd
-CRITOOL_PKG=github.com/kubernetes-incubator/cri-tools
-CRI_CONTAINERD_PKG=github.com/containerd/cri
-
-# Create a temporary GOPATH for make install.deps.
-TMPGOPATH=$(mktemp -d /tmp/cri-containerd-install-deps.XXXX)
-GOPATH=${TMPGOPATH}
-
-# checkout_repo checks out specified repository
-# and switch to specified  version.
-# Varset:
-# 1) Pkg name;
-# 2) Version;
-# 3) Repo name;
-checkout_repo() {
-  local -r pkg=$1
-  local -r version=$2
-  local -r repo=$3
-  path="${GOPATH}/src/${pkg}"
-  if [ ! -d ${path} ]; then
-    mkdir -p ${path}
-    git clone https://${repo} ${path}
-  fi
-  cd ${path}
-  git fetch --all
-  git checkout ${version}
-}
-
-# Install runc
-checkout_repo ${RUNC_PKG} ${RUNC_VERSION} ${RUNC_REPO}
-cd ${GOPATH}/src/${RUNC_PKG}
-BUILDTAGS=${BUILDTAGS:-seccomp apparmor}
-make static BUILDTAGS="$BUILDTAGS"
-${sudo} make install -e DESTDIR=${RUNC_DIR}
-
-# Install cni
-if ${INSTALL_CNI}; then
-  checkout_repo ${CNI_PKG} ${CNI_VERSION} ${CNI_REPO}
-  cd ${GOPATH}/src/${CNI_PKG}
-  FASTBUILD=true ./build.sh
-  ${sudo} mkdir -p ${CNI_DIR}
-  ${sudo} cp -r ./bin ${CNI_DIR}
-  ${sudo} mkdir -p ${CNI_CONFIG_DIR}
-  ${sudo} bash -c 'cat >'${CNI_CONFIG_DIR}'/10-containerd-net.conflist <<EOF
-{
-  "cniVersion": "0.3.1",
-  "name": "containerd-net",
-  "plugins": [
-    {
-      "type": "bridge",
-      "bridge": "cni0",
-      "isGateway": true,
-      "ipMasq": true,
-      "promiscMode": true,
-      "ipam": {
-        "type": "host-local",
-        "subnet": "10.88.0.0/16",
-        "routes": [
-          { "dst": "0.0.0.0/0" }
-        ]
-      }
-    },
-    {
-      "type": "portmap",
-      "capabilities": {"portMappings": true}
-    }
-  ]
-}
-EOF'
-fi
-
-# Install containerd
-checkout_repo ${CONTAINERD_PKG} ${CONTAINERD_VERSION} ${CONTAINERD_REPO}
-cd ${GOPATH}/src/${CONTAINERD_PKG}
-make BUILDTAGS="${BUILDTAGS}"
-# containerd make install requires `go` to work. Explicitly
-# set PATH to make sure it can find `go` even with `sudo`.
-${sudo} sh -c "PATH=${PATH} make install -e DESTDIR=${CONTAINERD_DIR}"
-
-#Install crictl
-checkout_repo ${CRITOOL_PKG} ${CRITOOL_VERSION} ${CRITOOL_REPO}
-cd ${GOPATH}/src/${CRITOOL_PKG}
-make crictl
-${sudo} make install-crictl -e BINDIR=${CRICTL_DIR} GOPATH=${GOPATH}
-${sudo} mkdir -p ${CRICTL_CONFIG_DIR}
-${sudo} bash -c 'cat >'${CRICTL_CONFIG_DIR}'/crictl.yaml <<EOF
-runtime-endpoint: /run/containerd/containerd.sock
-EOF'
-
-# Clean the tmp GOPATH dir. Use sudo because runc build generates
-# some privileged files.
-${sudo} rm -rf ${TMPGOPATH}
diff --git a/hack/install/install-cni.sh b/hack/install/install-cni.sh
new file mode 100755
index 000000000..d2db24425
--- /dev/null
+++ b/hack/install/install-cni.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+# Copyright 2018 The containerd Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+source $(dirname "${BASH_SOURCE[0]}")/utils.sh
+CNI_DIR=${DESTDIR}/opt/cni
+CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d
+CNI_PKG=github.com/containernetworking/plugins
+
+# Create a temporary GOPATH for cni installation.
+TMPGOPATH=$(mktemp -d /tmp/cri-install-cni.XXXX)
+GOPATH=${TMPGOPATH}
+
+# Install cni
+from-vendor CNI github.com/containernetworking/plugins
+checkout_repo ${CNI_PKG} ${CNI_VERSION} ${CNI_REPO}
+cd ${GOPATH}/src/${CNI_PKG}
+FASTBUILD=true ./build.sh
+${SUDO} mkdir -p ${CNI_DIR}
+${SUDO} cp -r ./bin ${CNI_DIR}
+${SUDO} mkdir -p ${CNI_CONFIG_DIR}
+${SUDO} bash -c 'cat >'${CNI_CONFIG_DIR}'/10-containerd-net.conflist <<EOF
+{
+  "cniVersion": "0.3.1",
+  "name": "containerd-net",
+  "plugins": [
+    {
+      "type": "bridge",
+      "bridge": "cni0",
+      "isGateway": true,
+      "ipMasq": true,
+      "promiscMode": true,
+      "ipam": {
+        "type": "host-local",
+        "subnet": "10.88.0.0/16",
+        "routes": [
+          { "dst": "0.0.0.0/0" }
+        ]
+      }
+    },
+    {
+      "type": "portmap",
+      "capabilities": {"portMappings": true}
+    }
+  ]
+}
+EOF'
+
+# Clean the tmp GOPATH dir.
+rm -rf ${TMPGOPATH}
diff --git a/hack/install/install-containerd.sh b/hack/install/install-containerd.sh
new file mode 100755
index 000000000..84c8c6e4c
--- /dev/null
+++ b/hack/install/install-containerd.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Copyright 2018 The containerd Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+source $(dirname "${BASH_SOURCE[0]}")/utils.sh
+CONTAINERD_DIR=${DESTDIR}/usr/local
+CONTAINERD_PKG=github.com/containerd/containerd
+
+# CHECKOUT_CONTAINERD indicates whether to checkout containerd repo.
+# This is useful for build containerd from existing repo, currently
+# used by containerd CI test.
+CHECKOUT_CONTAINERD=${CHECKOUT_CONTAINERD:-true}
+
+if ${CHECKOUT_CONTAINERD}; then
+  # Create a temporary GOPATH for containerd installation.
+  TMPGOPATH=$(mktemp -d /tmp/cri-install-containerd.XXXX)
+  GOPATH=${TMPGOPATH}
+  from-vendor CONTAINERD github.com/containerd/containerd
+  checkout_repo ${CONTAINERD_PKG} ${CONTAINERD_VERSION} ${CONTAINERD_REPO}
+fi
+
+# Install containerd
+cd ${GOPATH}/src/${CONTAINERD_PKG}
+make BUILDTAGS="${BUILDTAGS}"
+# containerd make install requires `go` to work. Explicitly
+# set PATH to make sure it can find `go` even with `sudo`.
+${SUDO} sh -c "PATH=${PATH} make install -e DESTDIR=${CONTAINERD_DIR}"
+
+# Clean the tmp GOPATH dir.
+if ${CHECKOUT_CONTAINERD}; then
+  rm -rf ${TMPGOPATH}
+fi
diff --git a/hack/install/install-crictl.sh b/hack/install/install-crictl.sh
new file mode 100755
index 000000000..eeb358340
--- /dev/null
+++ b/hack/install/install-crictl.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Copyright 2018 The containerd Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+source $(dirname "${BASH_SOURCE[0]}")/utils.sh
+CRICTL_DIR=${DESTDIR}/usr/local/bin
+CRICTL_CONFIG_DIR=${DESTDIR}/etc
+
+# Create a temporary GOPATH for crictl installation.
+TMPGOPATH=$(mktemp -d /tmp/cri-install-crictl.XXXX)
+GOPATH=${TMPGOPATH}
+
+#Install crictl
+checkout_repo ${CRITOOL_PKG} ${CRITOOL_VERSION} ${CRITOOL_REPO}
+cd ${GOPATH}/src/${CRITOOL_PKG}
+make crictl
+${SUDO} make install-crictl -e BINDIR=${CRICTL_DIR} GOPATH=${GOPATH}
+${SUDO} mkdir -p ${CRICTL_CONFIG_DIR}
+${SUDO} bash -c 'cat >'${CRICTL_CONFIG_DIR}'/crictl.yaml <<EOF
+runtime-endpoint: /run/containerd/containerd.sock
+EOF'
+
+# Clean the tmp GOPATH dir.
+rm -rf ${TMPGOPATH}
diff --git a/hack/install/install-deps.sh b/hack/install/install-deps.sh
new file mode 100755
index 000000000..b15b54842
--- /dev/null
+++ b/hack/install/install-deps.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# Copyright 2017 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Dependencies:
+# runc:
+# - libseccomp-dev(Ubuntu,Debian)/libseccomp-devel(Fedora, CentOS, RHEL). Note that
+# libseccomp in ubuntu <=trusty and debian <=jessie is not new enough, backport
+# is required.
+# - libapparmor-dev(Ubuntu,Debian)/libapparmor-devel(Fedora, CentOS, RHEL)
+# containerd:
+# - btrfs-tools(Ubuntu,Debian)/btrfs-progs-devel(Fedora, CentOS, RHEL)
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+cd $(dirname "${BASH_SOURCE[0]}")
+
+# INSTALL_CNI indicates whether to install CNI. CNI installation
+# makes sense for local testing, but doesn't make sense for cluster
+# setup, because CNI daemonset is usually used to deploy CNI binaries
+# and configurations in cluster.
+INSTALL_CNI=${INSTALL_CNI:-true}
+
+# Install runc
+./install-runc.sh
+
+# Install cni
+if ${INSTALL_CNI}; then
+  ./install-cni.sh
+fi
+
+# Install containerd
+./install-containerd.sh
+
+#Install crictl
+./install-crictl.sh
diff --git a/hack/install/install-runc.sh b/hack/install/install-runc.sh
new file mode 100755
index 000000000..cfd4e77a7
--- /dev/null
+++ b/hack/install/install-runc.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Copyright 2018 The containerd Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+source $(dirname "${BASH_SOURCE[0]}")/utils.sh
+RUNC_DIR=${DESTDIR}
+RUNC_PKG=github.com/opencontainers/runc
+
+# Create a temporary GOPATH for runc installation.
+TMPGOPATH=$(mktemp -d /tmp/cri-install-runc.XXXX)
+GOPATH=${TMPGOPATH}
+
+# Install runc
+from-vendor RUNC github.com/opencontainers/runc
+checkout_repo ${RUNC_PKG} ${RUNC_VERSION} ${RUNC_REPO}
+cd ${GOPATH}/src/${RUNC_PKG}
+make static BUILDTAGS="$BUILDTAGS"
+${SUDO} make install -e DESTDIR=${RUNC_DIR}
+
+# Clean the tmp GOPATH dir. Use sudo because runc build generates
+# some privileged files.
+${SUDO} rm -rf ${TMPGOPATH}
diff --git a/hack/install/utils.sh b/hack/install/utils.sh
new file mode 100755
index 000000000..69a6ea51e
--- /dev/null
+++ b/hack/install/utils.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# Copyright 2018 The containerd Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source $(dirname "${BASH_SOURCE[0]}")/../utils.sh
+
+# DESTDIR is the dest path to install dependencies.
+DESTDIR=${DESTDIR:-"/"}
+# Convert to absolute path if it's relative.
+if [[ ${DESTDIR} != /* ]]; then
+  DESTDIR=${ROOT}/${DESTDIR}
+fi
+
+# NOSUDO indicates not to use sudo during installation.
+NOSUDO=${NOSUDO:-false}
+SUDO="sudo"
+if ${NOSUDO}; then
+  SUDO=""
+fi
+
+# BUILDTAGS are bulid tags for runc and containerd.
+BUILDTAGS=${BUILDTAGS:-seccomp apparmor}
+
+# checkout_repo checks out specified repository
+# and switch to specified  version.
+# Varset:
+# 1) Pkg name;
+# 2) Version;
+# 3) Repo name;
+checkout_repo() {
+  local -r pkg=$1
+  local -r version=$2
+  local -r repo=$3
+  path="${GOPATH}/src/${pkg}"
+  if [ ! -d ${path} ]; then
+    mkdir -p ${path}
+    git clone https://${repo} ${path}
+  fi
+  cd ${path}
+  git fetch --all
+  git checkout ${version}
+}
diff --git a/hack/release.sh b/hack/release.sh
index 7976febae..506544684 100755
--- a/hack/release.sh
+++ b/hack/release.sh
@@ -38,7 +38,7 @@ destdir=${BUILD_DIR}/release-stage
 rm -rf ${destdir}
 
 # Install dependencies into release stage.
-NOSUDO=true INSTALL_CNI=${INCLUDE_CNI} DESTDIR=${destdir} ./hack/install-deps.sh
+NOSUDO=true INSTALL_CNI=${INCLUDE_CNI} DESTDIR=${destdir} ./hack/install/install-deps.sh
 
 if ${CUSTOM_CONTAINERD}; then
   make install -e DESTDIR=${destdir}
diff --git a/hack/sync-vendor.sh b/hack/sync-vendor.sh
index ea00062ab..a9b89cfc6 100755
--- a/hack/sync-vendor.sh
+++ b/hack/sync-vendor.sh
@@ -24,6 +24,7 @@ cd ${ROOT}
 
 echo "Compare vendor with containerd vendors..."
 containerd_vendor=$(mktemp /tmp/containerd-vendor.conf.XXXX)
+from-vendor CONTAINERD github.com/containerd/containerd
 curl -s https://raw.githubusercontent.com/${CONTAINERD_REPO#*/}/${CONTAINERD_VERSION}/vendor.conf > ${containerd_vendor}
 # Create a temporary vendor file to update.
 tmp_vendor=$(mktemp /tmp/vendor.conf.XXXX)
diff --git a/hack/test-cri.sh b/hack/test-cri.sh
index f34aec0d4..320359598 100755
--- a/hack/test-cri.sh
+++ b/hack/test-cri.sh
@@ -36,7 +36,6 @@ fi
 GOPATH=${GOPATH%%:*}
 
 CRITEST=${GOPATH}/bin/critest
-CRITOOL_PKG=github.com/kubernetes-incubator/cri-tools
 
 # Install critest
 if [ ! -x "$(command -v ${CRITEST})" ]; then
diff --git a/hack/test-e2e-node.sh b/hack/test-e2e-node.sh
index 0d411fc93..efdae895a 100755
--- a/hack/test-e2e-node.sh
+++ b/hack/test-e2e-node.sh
@@ -59,6 +59,12 @@ fi
 GOPATH=${GOPATH%%:*}
 
 # Get kubernetes
+from-vendor KUBERNETES k8s.io/kubernetes
+# k8s.io is actually a redirect, but we do not handle the go-import
+# metadata which `go get` and `vndr` etc do. Handle it manually here.
+if [ x"$KUBERNETES_REPO" = "xk8s.io" ] ; then
+  KUBERNETES_REPO="https://github.com/kubernetes/kubernetes"
+fi
 KUBERNETES_PATH="${GOPATH}/src/k8s.io/kubernetes"
 if [ ! -d "${KUBERNETES_PATH}" ]; then
   mkdir -p ${KUBERNETES_PATH}
diff --git a/hack/utils.sh b/hack/utils.sh
index 86d339c08..074b953a5 100755
--- a/hack/utils.sh
+++ b/hack/utils.sh
@@ -18,8 +18,12 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
 
 # Not from vendor.conf.
 CRITOOL_VERSION=b184f9aefe60a4441330e615ee20634ee26474fb
+CRITOOL_PKG=github.com/kubernetes-incubator/cri-tools
 CRITOOL_REPO=github.com/kubernetes-incubator/cri-tools
 
+# VENDOR is the path to vendor.conf.
+VENDOR=${VENDOR:-"${ROOT}/vendor.conf"}
+
 # upload_logs_to_gcs uploads test logs to gcs.
 # Var set:
 # 1. Bucket: gcs bucket to upload logs.
@@ -72,7 +76,7 @@ sha256() {
 from-vendor() {
     local what=$1
     local repo=$2
-    local vendor=$(dirname "${BASH_SOURCE[0]}")/../vendor.conf
+    local vendor=$VENDOR
     setvars=$(awk -v REPO=$repo -v WHAT=$what -- '
                   BEGIN { rc=1 }                        # Assume we did not find what we were looking for.
                   // {
@@ -91,14 +95,3 @@ from-vendor() {
     fi
     eval $setvars
 }
-
-from-vendor RUNC       github.com/opencontainers/runc
-from-vendor CNI        github.com/containernetworking/plugins
-from-vendor CONTAINERD github.com/containerd/containerd
-from-vendor KUBERNETES k8s.io/kubernetes
-
-# k8s.io is actually a redirect, but we do not handle the go-import
-# metadata which `go get` and `vndr` etc do. Handle it manually here.
-if [ x"$KUBERNETES_REPO" = "xk8s.io" ] ; then
-    KUBERNETES_REPO="https://github.com/kubernetes/kubernetes"
-fi
diff --git a/test/build-containerd.sh b/test/build-containerd.sh
new file mode 100755
index 000000000..1cff039a4
--- /dev/null
+++ b/test/build-containerd.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# Copyright 2018 The containerd Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script is used to build and upload latest containerd from
+# containerd/containerd in gcr.io/k8s-testimages/kubekins-e2e.
+
+set -o xtrace
+set -o errexit
+set -o nounset
+set -o pipefail
+
+source $(dirname "${BASH_SOURCE[0]}")/build-utils.sh
+cd "${ROOT}"
+
+if [ -z "${GOPATH}" ]; then
+  echo "GOPATH is not set"
+  exit 1
+fi
+
+CONTAINERD_PATH=${GOPATH}/src/github.com/containerd/containerd
+if [ ! -d "${CONTAINERD_PATH}" ]; then
+  echo "containerd repo does not exist"
+  exit 1
+fi
+
+# Make sure output directory is clean.
+make clean
+# Build and push test tarball.
+PUSH_VERSION=true DEPLOY_DIR=${DEPLOY_DIR:-""} \
+  make push TARBALL_PREFIX=containerd-cni \
+  INCLUDE_CNI=true \
+  CHECKOUT_CONTAINERD=false \
+  VENDOR=${CONTAINERD_PATH}/vendor.conf
diff --git a/test/build-utils.sh b/test/build-utils.sh
new file mode 100755
index 000000000..b50c19837
--- /dev/null
+++ b/test/build-utils.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Copyright 2018 The containerd Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+
+# PROJECT is the gce project to upload tarball.
+PROJECT=${PROJECT:-"k8s-cri-containerd"}
+
+# GOOGLE_APPLICATION_CREDENTIALS is the path of service account file.
+if [ -z ${GOOGLE_APPLICATION_CREDENTIALS} ]; then
+  echo "GOOGLE_APPLICATION_CREDENTIALS is not set"
+  exit 1
+fi
+
+# Activate gcloud service account.
+gcloud auth activate-service-account --key-file "${GOOGLE_APPLICATION_CREDENTIALS}" --project="${PROJECT}"
+
+# Install dependent libraries.
+sh -c "echo 'deb http://ftp.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list"
+apt-get update
+apt-get install -y btrfs-tools
+apt-get install -y libseccomp2/jessie-backports
+apt-get install -y libseccomp-dev/jessie-backports
+apt-get install -y libapparmor-dev
+
+# PULL_REFS is from prow.
+if [ ! -z "${PULL_REFS:-""}" ]; then
+  DEPLOY_DIR=$(echo "${PULL_REFS}" | sha1sum | awk '{print $1}')
+fi
diff --git a/test/build.sh b/test/build.sh
index d246d1663..76aaa9e59 100755
--- a/test/build.sh
+++ b/test/build.sh
@@ -14,45 +14,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This script is used to build and upload cri-containerd in gcr.io/k8s-testimages/kubekins-e2e.
+# This script is used to build and upload containerd with latest CRI plugin
+# from containerd/cri in gcr.io/k8s-testimages/kubekins-e2e.
 
 set -o xtrace
 set -o errexit
 set -o nounset
 set -o pipefail
 
-ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+source $(dirname "${BASH_SOURCE[0]}")/build-utils.sh
 cd "${ROOT}"
 
-# PROJECT is the gce project to upload tarball.
-PROJECT=${PROJECT:-"k8s-cri-containerd"}
-
-# GOOGLE_APPLICATION_CREDENTIALS is the path of service account file.
-if [ -z ${GOOGLE_APPLICATION_CREDENTIALS} ]; then
-  echo "GOOGLE_APPLICATION_CREDENTIALS is not set"
-  exit 1
-fi
-
-# Activate gcloud service account.
-gcloud auth activate-service-account --key-file "${GOOGLE_APPLICATION_CREDENTIALS}" --project="${PROJECT}"
-
-# Install dependent libraries.
-sh -c "echo 'deb http://ftp.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list"
-apt-get update
-apt-get install -y btrfs-tools
-apt-get install -y libseccomp2/jessie-backports
-apt-get install -y libseccomp-dev/jessie-backports
-apt-get install -y libapparmor-dev
-
-# PULL_REFS is from prow.
-if [ ! -z "${PULL_REFS:-""}" ]; then
-  DEPLOY_DIR=$(echo "${PULL_REFS}" | sha1sum | awk '{print $1}')
-fi
-
 # Make sure output directory is clean.
 make clean
-# Build and push e2e tarball.
-DEPLOY_DIR=${DEPLOY_DIR:-""} make push
-# Build and push node e2e tarball.
+# Build and push test tarball.
 PUSH_VERSION=true DEPLOY_DIR=${DEPLOY_DIR:-""} \
   make push TARBALL_PREFIX=cri-containerd-cni INCLUDE_CNI=true CUSTOM_CONTAINERD=true
diff --git a/test/configure.sh b/test/configure.sh
index c33d8b71e..f35f4925a 100755
--- a/test/configure.sh
+++ b/test/configure.sh
@@ -50,7 +50,7 @@ fi
 # By default use the release tarball with cni built in.
 PKG_PREFIX=${PKG_PREFIX:-"cri-containerd-cni"}
 # PKG_PREFIX_METADATA is the metadata key of PKG_PREFIX.
-PKG_PREFIX_METADATA="pkg_prefix"
+PKG_PREFIX_METADATA="pkg-prefix"
 pkg_prefix=$(fetch_metadata "${PKG_PREFIX_METADATA}")
 if [ ! -z "${pkg_prefix}" ]; then
   PKG_PREFIX=${pkg_prefix}
diff --git a/test/e2e_node/image-config-containerd.yaml b/test/e2e_node/image-config-containerd.yaml
new file mode 100644
index 000000000..a3960cc5f
--- /dev/null
+++ b/test/e2e_node/image-config-containerd.yaml
@@ -0,0 +1,9 @@
+images:
+  ubuntu:
+    image: ubuntu-gke-1604-xenial-v20170420-1
+    project: ubuntu-os-gke-cloud
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,pkg-prefix=containerd-cni"
+  cos-stable:
+    image_regex: cos-stable-60-9592-84-0
+    project: cos-cloud
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled,pkg-prefix=containerd-cni"
diff --git a/vendor.conf b/vendor.conf
index c0626863b..2b5e9b824 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -3,11 +3,11 @@ github.com/blang/semver v3.1.0
 github.com/boltdb/bolt e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd
 github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
 github.com/containerd/cgroups fe281dd265766145e943a034aa41086474ea6130
-github.com/containerd/console 84eeaae905fa414d03e07bcd6c8d3f19e7cf180e
+github.com/containerd/console cb7008ab3d8359b78c5f464cb7cf160107ad5925
 github.com/containerd/containerd 3c1ef1a714cf5b0104f340f76d539802fc24c75f
 github.com/containerd/continuity d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371
-github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6
-github.com/containerd/go-runc 4f6e87ae043f859a38255247b49c9abc262d002f
+github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
+github.com/containerd/go-runc bcb223a061a3dd7de1a89c0b402a60f4dd9bd307
 github.com/containerd/go-cni f2d7272f12d045b16ed924f50e91f9f9cecc55a7
 github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788
 github.com/containernetworking/cni v0.6.0
diff --git a/vendor/github.com/containerd/console/console.go b/vendor/github.com/containerd/console/console.go
index bf2798fda..c187a9b41 100644
--- a/vendor/github.com/containerd/console/console.go
+++ b/vendor/github.com/containerd/console/console.go
@@ -1,3 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package console
 
 import (
diff --git a/vendor/github.com/containerd/console/console_linux.go b/vendor/github.com/containerd/console/console_linux.go
index c96372929..312bce17d 100644
--- a/vendor/github.com/containerd/console/console_linux.go
+++ b/vendor/github.com/containerd/console/console_linux.go
@@ -1,5 +1,21 @@
 // +build linux
 
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package console
 
 import (
diff --git a/vendor/github.com/containerd/console/console_unix.go b/vendor/github.com/containerd/console/console_unix.go
index 118c8c3ab..a4a8d1267 100644
--- a/vendor/github.com/containerd/console/console_unix.go
+++ b/vendor/github.com/containerd/console/console_unix.go
@@ -1,4 +1,20 @@
-// +build darwin freebsd linux solaris
+// +build darwin freebsd linux openbsd solaris
+
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
 
 package console
 
diff --git a/vendor/github.com/containerd/console/console_windows.go b/vendor/github.com/containerd/console/console_windows.go
index d78a0b841..7aa726f99 100644
--- a/vendor/github.com/containerd/console/console_windows.go
+++ b/vendor/github.com/containerd/console/console_windows.go
@@ -1,3 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package console
 
 import (
diff --git a/vendor/github.com/containerd/console/tc_darwin.go b/vendor/github.com/containerd/console/tc_darwin.go
index b102bad74..b0128abb0 100644
--- a/vendor/github.com/containerd/console/tc_darwin.go
+++ b/vendor/github.com/containerd/console/tc_darwin.go
@@ -1,3 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package console
 
 import (
diff --git a/vendor/github.com/containerd/console/tc_freebsd.go b/vendor/github.com/containerd/console/tc_freebsd.go
index e2a10e441..04583a615 100644
--- a/vendor/github.com/containerd/console/tc_freebsd.go
+++ b/vendor/github.com/containerd/console/tc_freebsd.go
@@ -1,3 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package console
 
 import (
diff --git a/vendor/github.com/containerd/console/tc_linux.go b/vendor/github.com/containerd/console/tc_linux.go
index 80ef2f6fb..1bdd68e6d 100644
--- a/vendor/github.com/containerd/console/tc_linux.go
+++ b/vendor/github.com/containerd/console/tc_linux.go
@@ -1,3 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package console
 
 import (
@@ -13,25 +29,21 @@ const (
 	cmdTcSet = unix.TCSETS
 )
 
-func ioctl(fd, flag, data uintptr) error {
-	if _, _, err := unix.Syscall(unix.SYS_IOCTL, fd, flag, data); err != 0 {
+// unlockpt unlocks the slave pseudoterminal device corresponding to the master pseudoterminal referred to by f.
+// unlockpt should be called before opening the slave side of a pty.
+func unlockpt(f *os.File) error {
+	var u int32
+	if _, _, err := unix.Syscall(unix.SYS_IOCTL, f.Fd(), unix.TIOCSPTLCK, uintptr(unsafe.Pointer(&u))); err != 0 {
 		return err
 	}
 	return nil
 }
 
-// unlockpt unlocks the slave pseudoterminal device corresponding to the master pseudoterminal referred to by f.
-// unlockpt should be called before opening the slave side of a pty.
-func unlockpt(f *os.File) error {
-	var u int32
-	return ioctl(f.Fd(), unix.TIOCSPTLCK, uintptr(unsafe.Pointer(&u)))
-}
-
 // ptsname retrieves the name of the first available pts for the given master.
 func ptsname(f *os.File) (string, error) {
-	n, err := unix.IoctlGetInt(int(f.Fd()), unix.TIOCGPTN)
-	if err != nil {
+	var u uint32
+	if _, _, err := unix.Syscall(unix.SYS_IOCTL, f.Fd(), unix.TIOCGPTN, uintptr(unsafe.Pointer(&u))); err != 0 {
 		return "", err
 	}
-	return fmt.Sprintf("/dev/pts/%d", n), nil
+	return fmt.Sprintf("/dev/pts/%d", u), nil
 }
diff --git a/vendor/github.com/containerd/console/tc_openbsd_cgo.go b/vendor/github.com/containerd/console/tc_openbsd_cgo.go
new file mode 100644
index 000000000..f0cec06a7
--- /dev/null
+++ b/vendor/github.com/containerd/console/tc_openbsd_cgo.go
@@ -0,0 +1,51 @@
+// +build openbsd,cgo
+
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package console
+
+import (
+	"os"
+
+	"golang.org/x/sys/unix"
+)
+
+//#include <stdlib.h>
+import "C"
+
+const (
+	cmdTcGet = unix.TIOCGETA
+	cmdTcSet = unix.TIOCSETA
+)
+
+// ptsname retrieves the name of the first available pts for the given master.
+func ptsname(f *os.File) (string, error) {
+	ptspath, err := C.ptsname(C.int(f.Fd()))
+	if err != nil {
+		return "", err
+	}
+	return C.GoString(ptspath), nil
+}
+
+// unlockpt unlocks the slave pseudoterminal device corresponding to the master pseudoterminal referred to by f.
+// unlockpt should be called before opening the slave side of a pty.
+func unlockpt(f *os.File) error {
+	if _, err := C.grantpt(C.int(f.Fd())); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/vendor/github.com/containerd/console/tc_openbsd_nocgo.go b/vendor/github.com/containerd/console/tc_openbsd_nocgo.go
new file mode 100644
index 000000000..daccce205
--- /dev/null
+++ b/vendor/github.com/containerd/console/tc_openbsd_nocgo.go
@@ -0,0 +1,47 @@
+// +build openbsd,!cgo
+
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+//
+// Implementing the functions below requires cgo support.  Non-cgo stubs
+// versions are defined below to enable cross-compilation of source code
+// that depends on these functions, but the resultant cross-compiled
+// binaries cannot actually be used.  If the stub function(s) below are
+// actually invoked they will display an error message and cause the
+// calling process to exit.
+//
+
+package console
+
+import (
+	"os"
+
+	"golang.org/x/sys/unix"
+)
+
+const (
+	cmdTcGet = unix.TIOCGETA
+	cmdTcSet = unix.TIOCSETA
+)
+
+func ptsname(f *os.File) (string, error) {
+	panic("ptsname() support requires cgo.")
+}
+
+func unlockpt(f *os.File) error {
+	panic("unlockpt() support requires cgo.")
+}
diff --git a/vendor/github.com/containerd/console/tc_solaris_cgo.go b/vendor/github.com/containerd/console/tc_solaris_cgo.go
index f8066d8e3..e36a68edd 100644
--- a/vendor/github.com/containerd/console/tc_solaris_cgo.go
+++ b/vendor/github.com/containerd/console/tc_solaris_cgo.go
@@ -1,5 +1,21 @@
 // +build solaris,cgo
 
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package console
 
 import (
diff --git a/vendor/github.com/containerd/console/tc_solaris_nocgo.go b/vendor/github.com/containerd/console/tc_solaris_nocgo.go
index 0aefa0d2b..eb0bd2c36 100644
--- a/vendor/github.com/containerd/console/tc_solaris_nocgo.go
+++ b/vendor/github.com/containerd/console/tc_solaris_nocgo.go
@@ -1,5 +1,21 @@
 // +build solaris,!cgo
 
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 //
 // Implementing the functions below requires cgo support.  Non-cgo stubs
 // versions are defined below to enable cross-compilation of source code
diff --git a/vendor/github.com/containerd/console/tc_unix.go b/vendor/github.com/containerd/console/tc_unix.go
index df7dcb933..7ae773c53 100644
--- a/vendor/github.com/containerd/console/tc_unix.go
+++ b/vendor/github.com/containerd/console/tc_unix.go
@@ -1,4 +1,20 @@
-// +build darwin freebsd linux solaris
+// +build darwin freebsd linux openbsd solaris
+
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
 
 package console
 
diff --git a/vendor/github.com/containerd/fifo/fifo.go b/vendor/github.com/containerd/fifo/fifo.go
index 8d9bc6a7d..e79813da7 100644
--- a/vendor/github.com/containerd/fifo/fifo.go
+++ b/vendor/github.com/containerd/fifo/fifo.go
@@ -1,3 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package fifo
 
 import (
diff --git a/vendor/github.com/containerd/fifo/handle_linux.go b/vendor/github.com/containerd/fifo/handle_linux.go
index 8b9c66304..6ac89b6a4 100644
--- a/vendor/github.com/containerd/fifo/handle_linux.go
+++ b/vendor/github.com/containerd/fifo/handle_linux.go
@@ -1,5 +1,21 @@
 // +build linux
 
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package fifo
 
 import (
diff --git a/vendor/github.com/containerd/fifo/handle_nolinux.go b/vendor/github.com/containerd/fifo/handle_nolinux.go
index f0c8485da..4f2a282b2 100644
--- a/vendor/github.com/containerd/fifo/handle_nolinux.go
+++ b/vendor/github.com/containerd/fifo/handle_nolinux.go
@@ -1,5 +1,21 @@
 // +build !linux
 
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package fifo
 
 import (
diff --git a/vendor/github.com/containerd/fifo/mkfifo_nosolaris.go b/vendor/github.com/containerd/fifo/mkfifo_nosolaris.go
index 8c6ea45eb..2799a06d1 100644
--- a/vendor/github.com/containerd/fifo/mkfifo_nosolaris.go
+++ b/vendor/github.com/containerd/fifo/mkfifo_nosolaris.go
@@ -1,5 +1,21 @@
 // +build !solaris
 
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package fifo
 
 import "syscall"
diff --git a/vendor/github.com/containerd/fifo/mkfifo_solaris.go b/vendor/github.com/containerd/fifo/mkfifo_solaris.go
index 8d588a45a..1ecd722ae 100644
--- a/vendor/github.com/containerd/fifo/mkfifo_solaris.go
+++ b/vendor/github.com/containerd/fifo/mkfifo_solaris.go
@@ -1,5 +1,21 @@
 // +build solaris
 
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package fifo
 
 import (
diff --git a/vendor/github.com/containerd/go-runc/command_linux.go b/vendor/github.com/containerd/go-runc/command_linux.go
index 8b4a502d6..d97400d06 100644
--- a/vendor/github.com/containerd/go-runc/command_linux.go
+++ b/vendor/github.com/containerd/go-runc/command_linux.go
@@ -1,3 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package runc
 
 import (
diff --git a/vendor/github.com/containerd/go-runc/command_other.go b/vendor/github.com/containerd/go-runc/command_other.go
index bf03a2f9d..5209a14fb 100644
--- a/vendor/github.com/containerd/go-runc/command_other.go
+++ b/vendor/github.com/containerd/go-runc/command_other.go
@@ -1,5 +1,21 @@
 // +build !linux
 
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package runc
 
 import (
diff --git a/vendor/github.com/containerd/go-runc/console.go b/vendor/github.com/containerd/go-runc/console.go
index 141e64dde..e81730075 100644
--- a/vendor/github.com/containerd/go-runc/console.go
+++ b/vendor/github.com/containerd/go-runc/console.go
@@ -1,3 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package runc
 
 import (
diff --git a/vendor/github.com/containerd/go-runc/container.go b/vendor/github.com/containerd/go-runc/container.go
index 7981aac9c..107381a55 100644
--- a/vendor/github.com/containerd/go-runc/container.go
+++ b/vendor/github.com/containerd/go-runc/container.go
@@ -1,3 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package runc
 
 import "time"
diff --git a/vendor/github.com/containerd/go-runc/events.go b/vendor/github.com/containerd/go-runc/events.go
index ca0e0481c..d610aeb34 100644
--- a/vendor/github.com/containerd/go-runc/events.go
+++ b/vendor/github.com/containerd/go-runc/events.go
@@ -1,3 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package runc
 
 type Event struct {
diff --git a/vendor/github.com/containerd/go-runc/io.go b/vendor/github.com/containerd/go-runc/io.go
index 0c3f1a9b3..1b59a7ef9 100644
--- a/vendor/github.com/containerd/go-runc/io.go
+++ b/vendor/github.com/containerd/go-runc/io.go
@@ -1,3 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package runc
 
 import (
diff --git a/vendor/github.com/containerd/go-runc/monitor.go b/vendor/github.com/containerd/go-runc/monitor.go
index 2d62c5a41..ff06a3fca 100644
--- a/vendor/github.com/containerd/go-runc/monitor.go
+++ b/vendor/github.com/containerd/go-runc/monitor.go
@@ -1,3 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package runc
 
 import (
diff --git a/vendor/github.com/containerd/go-runc/runc.go b/vendor/github.com/containerd/go-runc/runc.go
index df76ad77a..74d77c192 100644
--- a/vendor/github.com/containerd/go-runc/runc.go
+++ b/vendor/github.com/containerd/go-runc/runc.go
@@ -1,3 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package runc
 
 import (
@@ -21,6 +37,15 @@ import (
 // Format is the type of log formatting options avaliable
 type Format string
 
+// TopBody represents the structured data of the full ps output
+type TopResults struct {
+	// Processes running in the container, where each is process is an array of values corresponding to the headers
+	Processes [][]string `json:"Processes"`
+
+	// Headers are the names of the columns
+	Headers []string `json:"Headers"`
+}
+
 const (
 	none Format = ""
 	JSON Format = "json"
@@ -379,6 +404,20 @@ func (r *Runc) Ps(context context.Context, id string) ([]int, error) {
 	return pids, nil
 }
 
+// Top lists all the processes inside the container returning the full ps data
+func (r *Runc) Top(context context.Context, id string, psOptions string) (*TopResults, error) {
+	data, err := cmdOutput(r.command(context, "ps", "--format", "table", id, psOptions), true)
+	if err != nil {
+		return nil, fmt.Errorf("%s: %s", err, data)
+	}
+
+	topResults, err := parsePSOutput(data)
+	if err != nil {
+		return nil, fmt.Errorf("%s: ", err)
+	}
+	return topResults, nil
+}
+
 type CheckpointOpts struct {
 	// ImagePath is the path for saving the criu image file
 	ImagePath string
diff --git a/vendor/github.com/containerd/go-runc/utils.go b/vendor/github.com/containerd/go-runc/utils.go
index 8cb241aca..cc0af3fe8 100644
--- a/vendor/github.com/containerd/go-runc/utils.go
+++ b/vendor/github.com/containerd/go-runc/utils.go
@@ -1,9 +1,26 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package runc
 
 import (
 	"bytes"
 	"io/ioutil"
 	"strconv"
+	"strings"
 	"sync"
 	"syscall"
 )
@@ -43,3 +60,48 @@ func putBuf(b *bytes.Buffer) {
 	b.Reset()
 	bytesBufferPool.Put(b)
 }
+
+// fieldsASCII is similar to strings.Fields but only allows ASCII whitespaces
+func fieldsASCII(s string) []string {
+	fn := func(r rune) bool {
+		switch r {
+		case '\t', '\n', '\f', '\r', ' ':
+			return true
+		}
+		return false
+	}
+	return strings.FieldsFunc(s, fn)
+}
+
+// parsePSOutput parses the runtime's ps raw output and returns a TopResults
+func parsePSOutput(output []byte) (*TopResults, error) {
+	topResults := &TopResults{}
+
+	lines := strings.Split(string(output), "\n")
+	topResults.Headers = fieldsASCII(lines[0])
+
+	pidIndex := -1
+	for i, name := range topResults.Headers {
+		if name == "PID" {
+			pidIndex = i
+		}
+	}
+
+	for _, line := range lines[1:] {
+		if len(line) == 0 {
+			continue
+		}
+
+		fields := fieldsASCII(line)
+
+		if fields[pidIndex] == "-" {
+			continue
+		}
+
+		process := fields[:len(topResults.Headers)-1]
+		process = append(process, strings.Join(fields[len(topResults.Headers)-1:], " "))
+		topResults.Processes = append(topResults.Processes, process)
+
+	}
+	return topResults, nil
+}