diff --git a/hack/sort-vendor.sh b/hack/sort-vendor.sh
index f1c1e7ab0..58d2b7b74 100755
--- a/hack/sort-vendor.sh
+++ b/hack/sort-vendor.sh
@@ -23,6 +23,17 @@ source $(dirname "${BASH_SOURCE[0]}")/utils.sh
 cd ${ROOT}
 
 echo "Sort vendor.conf..."
-sort vendor.conf -o vendor.conf
+tmpdir="$(mktemp -d)"
+trap "rm -rf ${tmpdir}" EXIT
+
+awk -v RS= '{print > "'${tmpdir}/'TMP."NR}' vendor.conf
+for file in ${tmpdir}/*; do
+  if [[ -e "${tmpdir}/vendor.conf" ]]; then
+    echo >> "${tmpdir}/vendor.conf"
+  fi
+  sort -Vru "${file}" >> "${tmpdir}/vendor.conf"
+done
+
+mv "${tmpdir}/vendor.conf" vendor.conf
 
 echo "Please commit the change made by this file..."
diff --git a/vendor.conf b/vendor.conf
index 38a875a5f..49da57b6e 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -1,72 +1,79 @@
-github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
-github.com/BurntSushi/toml v0.3.1
-github.com/containerd/cgroups db272301ab8449d05f062e6db6f13d8a6aaff466
-github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
-github.com/containerd/containerd 31afff294400b5a69bdb3ec387ecdf5bad57a038
-github.com/containerd/continuity bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
-github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
-github.com/containerd/go-cni 22460c018b64cf8bf4151b3ff9c4d077e6a88cbf
-github.com/containerd/go-runc 5a6d9f37cfa36b15efba46dc7ea349fa9b7143c3
-github.com/containerd/ttrpc a5bd8ce9e40bc7c065a11c6936f4d032ce6bfa2b
-github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
-github.com/containernetworking/cni v0.6.0
-github.com/containernetworking/plugins v0.7.5
-github.com/coreos/go-systemd v14
-github.com/davecgh/go-spew v1.1.0
-github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580
-github.com/docker/docker 86f080cff0914e9694068ed78d503701667c4c00
-github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
-github.com/docker/go-metrics 4ea375f7759c82740c893fc030bc37088d2ec098
-github.com/docker/go-units v0.4.0
-github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528
-github.com/emicklei/go-restful v2.2.1
-github.com/godbus/dbus v3
-github.com/gogo/googleapis v1.2.0
-github.com/gogo/protobuf v1.2.1
-github.com/golang/protobuf v1.2.0
-github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c
-github.com/grpc-ecosystem/go-grpc-prometheus v1.1
-github.com/json-iterator/go 1.1.5
-github.com/matttproud/golang_protobuf_extensions v1.0.1
-github.com/Microsoft/go-winio 84b4ab48a50763fe7b3abcef38e5205c12027fac
-github.com/Microsoft/hcsshim 8abdbb8205e4192c68b5f84c31197156f31be517
-github.com/modern-go/concurrent 1.0.3
-github.com/modern-go/reflect2 1.0.1
-github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
-github.com/opencontainers/image-spec v1.0.1
-github.com/opencontainers/runc v1.0.0-rc8
-github.com/opencontainers/runtime-spec 29686dbc5559d93fb1ef402eeda3e35c38d75af4
-github.com/opencontainers/selinux v1.2.2
-github.com/pkg/errors v0.8.1
-github.com/pmezard/go-difflib v1.0.0
-github.com/prometheus/client_golang f4fb1b73fb099f396a7f0036bf86aa8def4ed823
-github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
-github.com/prometheus/common 89604d197083d4781071d3c65855d24ecfb0a563
-github.com/prometheus/procfs cb4147076ac75738c9a7d279075a253c0cc5acbd
-github.com/seccomp/libseccomp-golang v0.9.1
-github.com/sirupsen/logrus v1.4.1
-github.com/stretchr/testify v1.1.4
-github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2
+# cri dependencies
 github.com/tchap/go-patricia v2.2.6
-github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c
+github.com/opencontainers/selinux v1.2.2
+github.com/docker/docker 86f080cff0914e9694068ed78d503701667c4c00
+github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580
+
+# containerd dependencies
 go.etcd.io/bbolt 2eb7227adea1d5cf85f0bc2a82b7059b13c2fa68
-golang.org/x/crypto 88737f569e3a9c7ab309cdc09a07fe7fc87233c3
-golang.org/x/net f3200d17e092c607f615320ecaad13d87ad9a2b3
-golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4
-golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e
-golang.org/x/sys 4c4f7f33c9ed00de01c4c741d2177abfcfe19307 https://github.com/golang/sys
-golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
-golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
+google.golang.org/grpc 25c4f928eaa6d96443009bd842389fb4fa48664e # v1.20.1
 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
-google.golang.org/grpc 25c4f928eaa6d96443009bd842389fb4fa48664e
-gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
-gopkg.in/yaml.v2 v2.2.1
-k8s.io/api kubernetes-1.15.0
-k8s.io/apimachinery kubernetes-1.15.0
-k8s.io/apiserver kubernetes-1.15.0
+golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
+golang.org/x/sys 4c4f7f33c9ed00de01c4c741d2177abfcfe19307 https://github.com/golang/sys
+golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e
+golang.org/x/net f3200d17e092c607f615320ecaad13d87ad9a2b3
+github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c
+github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2
+github.com/sirupsen/logrus v1.4.1
+github.com/prometheus/procfs cb4147076ac75738c9a7d279075a253c0cc5acbd
+github.com/prometheus/common 89604d197083d4781071d3c65855d24ecfb0a563
+github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
+github.com/prometheus/client_golang f4fb1b73fb099f396a7f0036bf86aa8def4ed823
+github.com/pkg/errors v0.8.1
+github.com/opencontainers/runtime-spec 29686dbc5559d93fb1ef402eeda3e35c38d75af4 # v1.0.1-59-g29686db
+github.com/opencontainers/runc v1.0.0-rc8
+github.com/opencontainers/image-spec v1.0.1
+github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
+github.com/matttproud/golang_protobuf_extensions v1.0.1
+github.com/grpc-ecosystem/go-grpc-prometheus v1.1
+github.com/golang/protobuf v1.2.0
+github.com/gogo/protobuf v1.2.1
+github.com/gogo/googleapis v1.2.0
+github.com/godbus/dbus v3
+github.com/docker/go-units v0.4.0
+github.com/docker/go-metrics 4ea375f7759c82740c893fc030bc37088d2ec098
+github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
+github.com/coreos/go-systemd v14
+github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
+github.com/containerd/ttrpc a5bd8ce9e40bc7c065a11c6936f4d032ce6bfa2b
+github.com/containerd/go-runc 5a6d9f37cfa36b15efba46dc7ea349fa9b7143c3
+github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
+github.com/containerd/continuity bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
+github.com/containerd/containerd 31afff294400b5a69bdb3ec387ecdf5bad57a038
+github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
+github.com/containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
+github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
+github.com/Microsoft/hcsshim 8abdbb8205e4192c68b5f84c31197156f31be517
+github.com/Microsoft/go-winio 84b4ab48a50763fe7b3abcef38e5205c12027fac
+github.com/BurntSushi/toml v0.3.1
+
+# kubernetes dependencies
+sigs.k8s.io/yaml v1.1.0
+k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c
+k8s.io/kubernetes v1.15.0
+k8s.io/klog v0.3.1
 k8s.io/cri-api kubernetes-1.15.0
 k8s.io/client-go kubernetes-1.15.0
-k8s.io/klog v0.3.1
-k8s.io/kubernetes v1.15.0
-k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c
-sigs.k8s.io/yaml v1.1.0
+k8s.io/api kubernetes-1.15.0
+k8s.io/apiserver kubernetes-1.15.0
+k8s.io/apimachinery kubernetes-1.15.0
+gopkg.in/yaml.v2 v2.2.1
+gopkg.in/inf.v0 v0.9.0
+golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
+golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a
+golang.org/x/crypto 88737f569e3a9c7ab309cdc09a07fe7fc87233c3
+github.com/stretchr/testify v1.2.2
+github.com/seccomp/libseccomp-golang v0.9.1
+github.com/pmezard/go-difflib v1.0.0
+github.com/modern-go/reflect2 1.0.1
+github.com/modern-go/concurrent 1.0.3
+github.com/json-iterator/go 1.1.5
+github.com/google/gofuzz 24818f796faf91cd76ec7bddd72458fbced7a6c1
+github.com/emicklei/go-restful v2.2.1
+github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528
+github.com/davecgh/go-spew v1.1.1
+
+# cni dependencies
+github.com/containernetworking/plugins v0.7.5
+github.com/containernetworking/cni v0.6.0
+github.com/containerd/go-cni 22460c018b64cf8bf4151b3ff9c4d077e6a88cbf