diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
index 4fa61f6477..6a4e103356 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
@@ -252,6 +252,9 @@ src_compile() {
 		unset DOCKER_EXPERIMENTAL
 	fi
 
+	# disable optimizations due to https://github.com/golang/go/issues/14669
+	CFLAGS+=" -O0"
+
 	go_export
 
 	# verbose building