diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile
index bc407daa1..e14db0755 100644
--- a/test/pkg/containerd/Dockerfile
+++ b/test/pkg/containerd/Dockerfile
@@ -23,9 +23,6 @@ RUN apk add --no-cache --initdb -p /out \
     xfsprogs \
     tzdata
 
-# because we want the one from util-linux-misc at /sbin/blkdiscard to override the one from busybox
-RUN rm /out/usr/bin/blkdiscard    
-
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 RUN cp /out/usr/share/zoneinfo/UTC /out/etc/localtime
 
diff --git a/tools/containerd-dev/Dockerfile b/tools/containerd-dev/Dockerfile
index 7d29b8fff..e0dbbe088 100644
--- a/tools/containerd-dev/Dockerfile
+++ b/tools/containerd-dev/Dockerfile
@@ -6,7 +6,11 @@ FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a as builder
 # `test/pkg/containerd/Dockerfile` when changing this.
 ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git
 
-ENV CONTAINERD_COMMIT=v2.0.3
+# this commit is post-v2.0.3 and includes the fix for the blkdiscard issue
+# which is necessary for the root tests to pass when running on Alpine.
+# Once it is in semver, likely v2.0.4, we can switch to that.
+# See PR https://github.com/containerd/containerd/pull/11330
+ENV CONTAINERD_COMMIT=f35b7dae5f1f4f1277e4c39b89acb0a8ea669c48
 ENV GOPATH=/go
 RUN apk add go git
 RUN mkdir -p $GOPATH/src/github.com/containerd && \