diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild
index 4791b98af4..32715f2cfd 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild
@@ -6,7 +6,7 @@ GIT_COMMIT=e32519c693
 EGO_PN="github.com/docker/cli"
 
 COREOS_GO_PACKAGE="${EGO_PN}"
-COREOS_GO_VERSION="go1.17"
+COREOS_GO_VERSION="go1.18"
 
 inherit bash-completion-r1  golang-vcs-snapshot coreos-go-depend
 
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild
index 374c3814f0..c6b6f91f16 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild
@@ -4,12 +4,10 @@
 EAPI=7
 EGO_PN=github.com/docker/docker
 GIT_COMMIT=7f84219a3c
-# Flatcar: force building with go1.17 like upstream does
-COREOS_GO_VERSION="go1.17"
+COREOS_GO_VERSION="go1.18"
 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.17
 inherit coreos-go-depend
 
 DESCRIPTION="The core functions you need to create Docker images and run Docker containers"