diff --git a/_service b/_service
index 4d56e99..e2f3e26 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
     <param name="url">https://github.com/containerd/containerd.git</param>
     <param name="scm">git</param>
     <param name="filename">containerd</param>
-    <param name="versionformat">1.6.20_%h</param>
-    <param name="revision">v1.6.20</param>
+    <param name="versionformat">1.6.21_%h</param>
+    <param name="revision">v1.6.21</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/containerd-1.6.20_2806fc105739.tar.xz b/containerd-1.6.20_2806fc105739.tar.xz
deleted file mode 100644
index 58f639d..0000000
--- a/containerd-1.6.20_2806fc105739.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a397b4b03b5c2377581e05b9a142b46b98fef20fcac3fdc8508b300ca1ee91bb
-size 5216580
diff --git a/containerd-1.6.21_3dce8eb055cb.tar.xz b/containerd-1.6.21_3dce8eb055cb.tar.xz
new file mode 100644
index 0000000..029374f
--- /dev/null
+++ b/containerd-1.6.21_3dce8eb055cb.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74c01d964e4387350a1d1f57a4a6aef9136a0c03ad3122e80c762fbaa44d02c5
+size 5221052
diff --git a/containerd.changes b/containerd.changes
index 0510a56..08c8c3b 100644
--- a/containerd.changes
+++ b/containerd.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sun May 21 11:16:18 UTC 2023 - Aleksa Sarai <asarai@suse.com>
+
+- Update to containerd v1.6.21 for Docker v23.0.6-ce. Upstream release notes:
+  <https://github.com/containerd/containerd/releases/tag/v1.6.21> bsc#1211578
+- Require a minimum Go version explicitly rather than using golang(API).
+  Fixes the change for bsc#1210298.
+
+-------------------------------------------------------------------
+Thu May  4 12:50:57 UTC 2023 - Marcus Meissner <meissner@suse.com>
+
+[ This was only released in SLE. ]
+
+- unversion to golang requires to always use the current default go.
+  (bsc#1210298)
+
 -------------------------------------------------------------------
 Tue Apr 18 14:52:44 UTC 2023 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/containerd.spec b/containerd.spec
index de6bd9b..0b9a6bb 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 2806fc1057397dbaeefbea0e4e17bddfbd388f38
-%define git_short   2806fc105739
+%define git_version 3dce8eb055cbb6872793272b4f20ed16117344f8
+%define git_short   3dce8eb055cb
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:           containerd
-Version:        1.6.20
+Version:        1.6.21
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0
@@ -41,12 +41,12 @@ Source1:        %{name}-rpmlintrc
 Source2:        %{name}.service
 BuildRequires:  fdupes
 BuildRequires:  glibc-devel-static
+BuildRequires:  go >= 1.18
 BuildRequires:  go-go-md2man
 BuildRequires:  golang-packaging
 BuildRequires:  libbtrfs-devel >= 3.8
 BuildRequires:  libseccomp-devel >= 2.2
 BuildRequires:  pkg-config
-BuildRequires:  golang(API) = 1.18
 # We provide a git revision so that Docker can require it properly.
 Provides:       %{name}-git = %{git_version}
 # Currently runc is the only supported runtime for containerd. We pin the same