diff --git a/build/fietsje/deps_containerd.go b/build/fietsje/deps_containerd.go
index 6eea0e2..79b46aa 100644
--- a/build/fietsje/deps_containerd.go
+++ b/build/fietsje/deps_containerd.go
@@ -18,7 +18,7 @@
 
 func depsContainerd(p *planner) {
 	p.collectOverride(
-		"github.com/containerd/containerd", "8e685f78cf66e2901b2fbed2fdddd64449a74ab9",
+		"github.com/containerd/containerd", "v1.4.0-beta.2",
 		buildTags("no_zfs", "no_aufs", "no_devicemapper", "no_btrfs"),
 		disabledProtoBuild,
 	).use(
@@ -33,21 +33,24 @@
 		"github.com/containerd/fifo",
 		"github.com/containerd/go-cni",
 		"github.com/containerd/go-runc",
+		"github.com/containerd/imgcrypt",
+		"github.com/containers/ocicrypt",
 		"github.com/containerd/ttrpc",
 		"github.com/containerd/typeurl",
 		"github.com/containernetworking/cni",
 		"github.com/coreos/go-systemd/v22",
-		"github.com/cpuguy83/go-md2man",
+		"github.com/cpuguy83/go-md2man/v2",
 		"github.com/davecgh/go-spew",
-		"github.com/docker/distribution",
 		"github.com/docker/docker",
 		"github.com/docker/go-events",
 		"github.com/docker/go-metrics",
 		"github.com/docker/go-units",
 		"github.com/docker/spdystream",
 		"github.com/emicklei/go-restful",
+		"github.com/fullsailor/pkcs7",
 		"github.com/godbus/dbus/v5",
 		"github.com/gogo/protobuf",
+		"github.com/go-logr/logr",
 		"github.com/google/gofuzz",
 		"github.com/google/uuid",
 		"github.com/hashicorp/errwrap",
@@ -68,10 +71,9 @@
 		"github.com/prometheus/client_model",
 		"github.com/prometheus/common",
 		"github.com/prometheus/procfs",
-		"github.com/russross/blackfriday",
+		"github.com/russross/blackfriday/v2",
 		"github.com/seccomp/libseccomp-golang",
 		"github.com/sirupsen/logrus",
-		"github.com/stretchr/testify",
 		"github.com/syndtr/gocapability",
 		"github.com/tchap/go-patricia",
 		"github.com/urfave/cli",
@@ -84,8 +86,7 @@
 		"google.golang.org/genproto",
 		"gopkg.in/inf.v0",
 		"gopkg.in/yaml.v2",
-		"gotest.tools",
-		"k8s.io/klog",
+		"k8s.io/klog/v2",
 		"sigs.k8s.io/yaml",
 	).with(disabledProtoBuild).use(
 		"github.com/Microsoft/hcsshim",