diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/Manifest
index cc17710a6c..1a9426e263 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/Manifest
@@ -1 +1 @@
-DIST docker-cli-20.10.7.tar.gz 7523515 BLAKE2B 36ae46a28ca943e75419014b8b8453dbdd36bf240b9c36aed245447241dd07635da0319fd9b6ea409ecbe4c419eec8650d94d2a296e45a9c3b02a9a47a314888 SHA512 4523ae70cb27d848da119070171af2eb84e974ac39d70be4feee105e37c949487c7f72a9bc30c32ce71bffb0787e27b7b9194ce5a8aeae57bdfeb3f2d730010f
+DIST docker-cli-20.10.8.tar.gz 7526374 BLAKE2B 65b7733c9a71c7f266e83b7014ecdca998915e71352a1bbbb346be6a3a65f1ed6644b321b62d0592f2dbf308ff51d3d4ad0d9828831f5f90b451c6ff23452faa SHA512 60e9e623180d3cafd8bd6458d02574274871f94e88a0fa461e2200520717e837371a1b5d7fab6c9c4591e64807ab6f560e0756a9cfb1c1c8c9624b1f653346d0
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.7.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild
similarity index 97%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.7.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild
index e3c09bfd70..2010055927 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.7.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-GIT_COMMIT=f0df35096d
+GIT_COMMIT=311fbfaf7d
 EGO_PN="github.com/docker/cli"
 
 COREOS_GO_PACKAGE="${EGO_PN}"
-COREOS_GO_VERSION="go1.13"
+COREOS_GO_VERSION="go1.16"
 
 inherit bash-completion-r1  golang-vcs-snapshot coreos-go-depend
 
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest
index 3cd19e27c7..2f298ea885 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest
@@ -1 +1 @@
-DIST docker-20.10.7.tar.gz 11077660 BLAKE2B 081b36668ead0fd727ebdabc0d07fdf1992f64e3ab1e7c09933130b37f9ad60876c36d1fcda5619ba1bffac7fadafe63d7fc647868c3c6ba30429487c2ebc31b SHA512 2341faa3ebb903d74fa434712fce45e7acf0423710b97cdca11e3999db2819c4385d9a7fb3850925592f20f02c6261edbade6c9d6a2fefbc32f05a6b44ec3073
+DIST docker-20.10.8.tar.gz 11080739 BLAKE2B 1e5c14e23c4e9c8b0568cf19c98cb4cdbedc43742357bed61201f0188d5e3f4949d5e2a2231fd89635290c8784678005dff707a4e00ececfb82d88c69d31d235 SHA512 17c0519c8938227c578e5fe37689dd5a362b9673fabe06f98145b6fd5ae99e099a304c5706a84df30a2810855987fd694ac9cae7574023710fd1d99b0ca1aaf8
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.7.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.8.ebuild
similarity index 96%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.7.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.8.ebuild
index ab84facefa..8885a28ed0 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.7.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.8.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=7
 EGO_PN=github.com/docker/docker
-GIT_COMMIT=b0f5bc36fe
-# Flatcar: force building with go1.13 like upstream does
-COREOS_GO_VERSION="go1.13"
+GIT_COMMIT=4662437124
+# Flatcar: force building with go1.16 like upstream does
+COREOS_GO_VERSION="go1.16"
+COREOS_GO_GO111MODULE="off"
 
 inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot
-# Flatcar: use coreos-go-depend to force building with go1.13
+# Flatcar: use coreos-go-depend to force building with go1.16
 inherit coreos-go-depend
 
 DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
@@ -206,11 +207,6 @@ src_compile() {
 		fi
 	done
 
-	# Flatcar:
-	# need to set go1.13 in DOCKER_BUILDTAGS, to avoid build
-	# failures caused by github.com/pkg/errors >= 0.9.1.
-	DOCKER_BUILDTAGS+=" go1.13"
-
 	# Flatcar:
 	# inject LDFLAGS for torcx
 	if use hardened; then
diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild
index a10243ab7e..95e049c977 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild
@@ -11,8 +11,8 @@ KEYWORDS="amd64 arm64"
 
 # Explicitly list all packages that will be built into the image.
 RDEPEND="
-	~app-emulation/docker-20.10.7
-	~app-emulation/docker-cli-20.10.7
+	~app-emulation/docker-20.10.8
+	~app-emulation/docker-cli-20.10.8
 	~app-emulation/containerd-1.5.5
 	~app-emulation/docker-proxy-0.8.0_p20210525
 	~app-emulation/docker-runc-1.0.1