diff --git a/changelog/changes/2023-10-25-docker-gentoo-upstream.md b/changelog/changes/2023-10-25-docker-gentoo-upstream.md
index 397407dfbb..9320f364ca 100644
--- a/changelog/changes/2023-10-25-docker-gentoo-upstream.md
+++ b/changelog/changes/2023-10-25-docker-gentoo-upstream.md
@@ -2,3 +2,5 @@
   - **NOTE** The docker btrfs storage driver has been de-prioritised; BTRFS backed storage will now default to the `overlay2` driver
     ([changelog](https://docs.docker.com/engine/release-notes/23.0/#bug-fixes-and-enhancements-6), [upstream pr](https://github.com/moby/moby/pull/42661)).
     Using the btrfs driver can still be enforced by creating a respective [docker config](https://docs.docker.com/storage/storagedriver/btrfs-driver/#configure-docker-to-use-the-btrfs-storage-driver) at `/etc/docker/daemon.json`.
+  - **NOTE that if you are using btrfs-backed Docker storage and are upgrading to this new version then the driver for that storage will change to `overlay2`.**
+    To prevent this please create a respective docker daemon configuration file on affected nodes as discussed above.
diff --git a/sdk_container/src/third_party/portage-stable/eclass/go-env.eclass b/sdk_container/src/third_party/portage-stable/eclass/go-env.eclass
index eae95b9409..9d081f23a0 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/go-env.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/go-env.eclass
@@ -1,4 +1,4 @@
-# Copyright 2023 Flatcar Maintainers
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: go-env.eclass
@@ -6,7 +6,6 @@
 # Flatcar Maintainers <infra@flatcar.org>
 # @AUTHOR:
 # Flatcar Maintainers <infra@flatcar.org>
-# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Helper eclass for setting the Go compile environment. Required for cross-compiling.
 # @DESCRIPTION:
 # This eclass includes a helper function for setting the compile environment for Go ebuilds.
@@ -17,30 +16,28 @@ _GO_ENV_ECLASS=1
 
 inherit toolchain-funcs
 
+# @FUNCTION: go-env_set_compile_environment
+# @DESCRIPTION:
 # Set up basic compile environment: CC, CXX, and GOARCH.
 # Required for cross-compiling with crossdev.
 # If not set, host defaults will be used and the resulting binaries are host arch.
 # (e.g. "emerge-aarch64-cross-linux-gnu foo" run on x86_64 will emerge "foo" for x86_64
 #  instead of aarch64)
 go-env_set_compile_environment() {
-	_arch() {
-		local arch=$(tc-arch "${CHOST}}")
-		case "${arch}" in
-			x86)	echo "386" ;;
-			x64-*)	echo "amd64" ;;
-			ppc64)  if [[ "$(tc-endian "${${CHOST}}")" = "big" ]] then
-						echo "ppc64"
-					else
-						echo "ppc64le"
-					fi ;;
-			*)	echo "${arch}" ;;
-		esac
-	}
+	local arch=$(tc-arch "${CHOST}}")
+	case "${arch}" in
+		x86)	GOARCH="386" ;;
+		x64-*)	GOARCH="amd64" ;;
+		ppc64)	if [[ "$(tc-endian "${${CHOST}}")" = "big" ]] ; then
+					GOARCH="ppc64"
+				else
+					GOARCH="ppc64le"
+				fi ;;
+		*)	GOARCH="${arch}" ;;
+	esac
 
-	CC="$(tc-getCC)"
-	CXX="$(tc-getCXX)"
-	# Needs explicit export to arrive in go environment.
-	export GOARCH="$(_arch)"
+	tc-export CC CXX
+	export GOARCH
 }
 
 fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/go-module.eclass b/sdk_container/src/third_party/portage-stable/eclass/go-module.eclass
index 4908d85fb2..07757ca44e 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/go-module.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/go-module.eclass
@@ -68,6 +68,7 @@ esac
 if [[ -z ${_GO_MODULE_ECLASS} ]]; then
 _GO_MODULE_ECLASS=1
 
+# Flatcar: Keep this change until upstream has merged https://github.com/gentoo/gentoo/pull/33539
 inherit multiprocessing toolchain-funcs go-env
 
 if [[ ! ${GO_OPTIONAL} ]]; then
@@ -388,7 +389,8 @@ go-module_src_unpack() {
 		fi
 	fi
 
-    go-env_set_compile_environment
+	# Flatcar: Keep this change until upstream has merged https://github.com/gentoo/gentoo/pull/33539
+	go-env_set_compile_environment
 }
 
 # @FUNCTION: _go-module_src_unpack_gosum
diff --git a/sdk_container/src/third_party/portage-stable/eclass/golang-vcs-snapshot.eclass b/sdk_container/src/third_party/portage-stable/eclass/golang-vcs-snapshot.eclass
index ef4d31360f..637042f1b2 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/golang-vcs-snapshot.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/golang-vcs-snapshot.eclass
@@ -52,6 +52,7 @@ esac
 if [[ -z ${_GOLANG_VCS_SNAPSHOT_ECLASS} ]]; then
 _GOLANG_VCS_SNAPSHOT_ECLASS=1
 
+# Flatcar: Keep this change until upstream has merged https://github.com/gentoo/gentoo/pull/33539
 inherit golang-base go-env
 
 # @ECLASS_VARIABLE: EGO_VENDOR
@@ -119,7 +120,8 @@ golang-vcs-snapshot_src_unpack() {
 		done
 	fi
 
-    go-env_set_compile_environment
+	# Flatcar: Keep this change until upstream has merged https://github.com/gentoo/gentoo/pull/33539
+	go-env_set_compile_environment
 }
 
 fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/golang-vcs.eclass b/sdk_container/src/third_party/portage-stable/eclass/golang-vcs.eclass
index b31d24cc98..90245c1660 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/golang-vcs.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/golang-vcs.eclass
@@ -20,6 +20,7 @@ esac
 if [[ -z ${_GOLANG_VCS_ECLASS} ]]; then
 _GOLANG_VCS_ECLASS=1
 
+# Flatcar: Keep this change until upstream has merged https://github.com/gentoo/gentoo/pull/33539
 inherit estack golang-base go-env
 
 PROPERTIES+=" live"
@@ -86,7 +87,8 @@ _golang-vcs_env_setup() {
 		die "${ECLASS}: unable to create ${WORKDIR}/${P}"
 	return 0
 
-    go-env_set_compile_environment
+	# Flatcar: Keep this change until upstream has merged https://github.com/gentoo/gentoo/pull/33539
+	go-env_set_compile_environment
 }
 
 # @FUNCTION: _golang-vcs_fetch