diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch b/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
index 0ef0d38f..d53c7fe8 100644
--- a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
+++ b/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
@@ -19,12 +19,12 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git git.orig/Makefile  git.orig/Makefile
-index c61418e60..54a10eb42 100644
---- git.orig/Makefile
-+++ git.orig/Makefile
-@@ -112,7 +112,8 @@ endif
- GOPATHS=$(shell echo ${GOPATH} | tr ":" "\n" | tr ";" "\n")
+Index: containerd/Makefile
+===================================================================
+--- containerd.orig/Makefile
++++ containerd/Makefile
+@@ -127,7 +127,8 @@
+ GOPATHS=$(shell go env GOPATH | tr ":" "\n" | tr ";" "\n")
  
  TESTFLAGS_RACE=
 -GO_BUILD_FLAGS=
@@ -33,6 +33,3 @@ index c61418e60..54a10eb42 100644
  # See Golang issue re: '-trimpath': https://github.com/golang/go/issues/13809
  GO_GCFLAGS=$(shell				\
  	set -- ${GOPATHS};			\
--- 
-2.19.1
-
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb
index 5fe3e4fa..d85b3470 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd-opencontainers_git.bb
@@ -5,8 +5,8 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and
                support as well as checkpoint and restore for cloning and live migration of containers."
 
 
-SRCREV = "ccfc27e30d9f599efe6a7471ea1932dedf2beec8"
-SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=https;destsuffix=git/src/github.com/containerd/containerd \
+SRCREV = "f2cf411b79fab1cb95ae1bc968c8f35b5f4eef35"
+SRC_URI = "git://github.com/containerd/containerd;branch=main;protocol=https;destsuffix=git/src/github.com/containerd/containerd \
            file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \
            file://0001-build-don-t-use-gcflags-to-define-trimpath.patch \
           "
@@ -15,8 +15,8 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=ht
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1269f40c0d099c21a871163984590d89"
 
-CONTAINERD_VERSION = "v1.6.12"
-CVE_VERSION = "1.6.12"
+CONTAINERD_VERSION = "v1.7.0-beta"
+CVE_VERSION = "1.7.0-beta"
 
 # EXTRA_OEMAKE += "GODEBUG=1"