diff --git a/nodeup/pkg/model/containerd.go b/nodeup/pkg/model/containerd.go
index c85e367d0e..46f932c412 100644
--- a/nodeup/pkg/model/containerd.go
+++ b/nodeup/pkg/model/containerd.go
@@ -90,7 +90,7 @@ var containerdVersions = []packageVersion{
 		},
 	},
 
-	// 1.3.4 - Linux Generic
+	// 1.3.4 - Linux Generic AMD64
 	{
 		PackageVersion: "1.3.4",
 		PlainBinary:    true,
@@ -103,6 +103,19 @@ var containerdVersions = []packageVersion{
 		},
 	},
 
+	// 1.4.0 - Linux Generic AMD64
+	{
+		PackageVersion: "1.4.0",
+		PlainBinary:    true,
+		Architectures:  []architectures.Architecture{architectures.ArchitectureAmd64},
+		Source:         "https://github.com/containerd/containerd/releases/download/v1.4.0/cri-containerd-cni-1.4.0-linux-amd64.tar.gz",
+		Hash:           "b379f29417efd583f77e095173d4d0bd6bb001f0081b2a63d152ee7aef653ce1",
+		MapFiles: map[string]string{
+			"usr/local/bin":  "/usr",
+			"usr/local/sbin": "/usr",
+		},
+	},
+
 	// TIP: When adding the next version, copy the previous version, string replace the version and run:
 	//   VERIFY_HASHES=1 go test -v ./nodeup/pkg/model -run TestContainerdPackageHashes
 	// (you might want to temporarily comment out older versions on a slower connection and then validate)
diff --git a/pkg/model/components/containerd.go b/pkg/model/components/containerd.go
index c49804a9c3..09e7430119 100644
--- a/pkg/model/components/containerd.go
+++ b/pkg/model/components/containerd.go
@@ -50,7 +50,9 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
 
 		// Set containerd based on Kubernetes version
 		if fi.StringValue(containerd.Version) == "" {
-			if b.IsKubernetesGTE("1.18") {
+			if b.IsKubernetesGTE("1.19") {
+				containerd.Version = fi.String("1.4.0")
+			} else if b.IsKubernetesGTE("1.18") {
 				containerd.Version = fi.String("1.3.4")
 			} else {
 				return fmt.Errorf("containerd version is required")