diff --git a/Dockerfile b/Dockerfile
index 78975e9e64..f912918656 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -239,7 +239,7 @@ RUN set -x \
 	&& rm -rf "$GOPATH"
 
 # Install containerd
-ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
+ENV CONTAINERD_COMMIT 8508d2bec90b96403143a1104cdcbd56f6aeb361
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 9b998d5ef4..90c6d45561 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -195,7 +195,7 @@ RUN set -x \
 	&& rm -rf "$GOPATH"
 
 # Install containerd
-ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
+ENV CONTAINERD_COMMIT 8508d2bec90b96403143a1104cdcbd56f6aeb361
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index ae61eab74c..ab436b3d7b 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -193,7 +193,7 @@ RUN set -x \
 	&& rm -rf "$GOPATH"
 
 # Install containerd
-ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
+ENV CONTAINERD_COMMIT 8508d2bec90b96403143a1104cdcbd56f6aeb361
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
index 74885bf988..b1db57c970 100644
--- a/Dockerfile.ppc64le
+++ b/Dockerfile.ppc64le
@@ -206,7 +206,7 @@ RUN set -x \
 	&& rm -rf "$GOPATH"
 
 # Install containerd
-ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
+ENV CONTAINERD_COMMIT 8508d2bec90b96403143a1104cdcbd56f6aeb361
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
diff --git a/Dockerfile.s390x b/Dockerfile.s390x
index 8a11a1da45..7f68516251 100644
--- a/Dockerfile.s390x
+++ b/Dockerfile.s390x
@@ -214,7 +214,7 @@ RUN set -x \
 	&& rm -rf "$GOPATH"
 
 # Install containerd
-ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
+ENV CONTAINERD_COMMIT 8508d2bec90b96403143a1104cdcbd56f6aeb361
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
diff --git a/Dockerfile.simple b/Dockerfile.simple
index b7bbcf074a..3b9540875a 100644
--- a/Dockerfile.simple
+++ b/Dockerfile.simple
@@ -68,7 +68,7 @@ RUN set -x \
 	&& rm -rf "$GOPATH"
 
 # Install containerd
-ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
+ENV CONTAINERD_COMMIT 8508d2bec90b96403143a1104cdcbd56f6aeb361
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
diff --git a/hack/vendor.sh b/hack/vendor.sh
index c5adbf119e..e72a02aefc 100755
--- a/hack/vendor.sh
+++ b/hack/vendor.sh
@@ -136,7 +136,7 @@ clone git google.golang.org/cloud dae7e3d993bc3812a2185af60552bb6b847e52a0 https
 clone git github.com/docker/docker-credential-helpers v0.3.0
 
 # containerd
-clone git github.com/docker/containerd 0ac3cd1be170d180b2baed755e8f0da547ceb267
+clone git github.com/docker/containerd 8508d2bec90b96403143a1104cdcbd56f6aeb361
 
 # cluster
 clone git github.com/docker/swarmkit 8a761950fb4d9251c335dc6149a8a02756cb3b10