diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-1.3.6.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-1.4.0.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-1.3.6.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-1.4.0.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild
index 9cf5c98c48..70937c5cb7 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild
@@ -6,12 +6,13 @@ CROS_WORKON_PROJECT="coreos/updateservicectl"
 CROS_WORKON_LOCALNAME="updateservicectl"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/updateservicectl"
+COREOS_GO_VERSION="go1.8"
 inherit cros-workon coreos-go
 
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 else
-	CROS_WORKON_COMMIT="01a8b8faaa335b2f4d2c39195797d85a164825b1"  # tag v1.3.6
+	CROS_WORKON_COMMIT="0b60d85b5ebbe7f097c1c8e19f47fc7307ca322e" # v1.4.0
 	KEYWORDS="amd64 arm64"
 fi
 
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest
index 38b520225b..9f38dca25c 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest
@@ -1,4 +1,4 @@
 DIST go1.5.4.src.tar.gz 12059752 SHA256 002acabce7ddc140d0d55891f9d4fcfbdd806b9332fb8b110c91bc91afb0bc93 SHA512 bff8ad4e792fb92c382327d080f2383e623d39d474317d9b3132167707ced99b7b4866c9ab315b6479eb75891d146b3d71dc0f5a4e81a509090b3205684409ed WHIRLPOOL cd14fc92e513a1ef0882c0dfb28526fa5f8044b99935c7e022b9ca0c10190c8f8a8fb3cb251db280168cfbc00a2a2f25761dfac9b274aa37d2d66bb03360da6f
 DIST go1.6.3.src.tar.gz 12617426 SHA256 6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 SHA512 43e9b01220788112a185500bd53f091e7a0023a790092f428e2f40fc1a334dd148558b99d2a1c871b8cc79ad7d2d87a092b93eee7b5a27c2ee675c494de35306 WHIRLPOOL 0a22dc08b89ddfaccf1e871037e7ad6cdbf36f914de527011813d57a2d857478278202314b185e26aa905cb135d13cbea490d03337b42148c6fc2ef93a8cd9fe
 DIST go1.7.6.src.tar.gz 14173249 SHA256 1a67a4e688673fdff7ba41e73482b0e59ac5bd0f7acf703bc6d50cc775c5baba SHA512 b01846bfb17bf91a9c493c4d6c43bbe7e17270b9e8a229a2be4032b78ef9395f5512917ea9faab74a120c755bbd53bbd816b033caadcbb7679e91702b37f8c7f WHIRLPOOL 3f45bb07e1630939ade048ee4cb07c581641957e20552995bb0d4becb681caa11432bd74da00eb383fd554c7c5f6b9d900ca1432b445e6a2aa44f4cc52772c76
-DIST go1.8.2.src.tar.gz 15331437 SHA256 e10401faaa8ae29dbe87349c1814b07b1903d453f822215d7b274bbc335cbf79 SHA512 7e4f5f9db9134d1d257a8573c3fd58d6c9d30975ef44a91072bcdb8884d87f0030d918f6bc16e06847d95b2d35c4d8b541d5c9023eadd12da44d9794b3c30e68 WHIRLPOOL daa1c1949a9127ab67b6302ce0d8ea62574521a6e20bec832b2fe6bcdb31c30b59c351f05fdb71e63c5ec1bac405faaf6aa6514315055d59d33982d65161079d
+DIST go1.8.3.src.tar.gz 15345996 SHA256 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 SHA512 c6e67dd9e3acdf2aa776d920f91f3fb1802d624ba5d51e06b2c7c6b71bcfaf91f4024f7a442cecde69175c589f7f1163f0ae86d887e15ddde710e53ce0961284 WHIRLPOOL 918a13b5323c77093428890ac4759daa3f40bd9379df0b862f9ba0fcf7f0f99eb83e37294dec25329a792573b97ddccb417a43dc8cccbd41bf17df6b01ea77f2
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.8.2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.8.3.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.8.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.8.3.ebuild