diff --git a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/files/docker-1.12-no.json b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/files/docker-1.12-no.json
index b0a6eb5ba2..ee39cb4249 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/files/docker-1.12-no.json
+++ b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/files/docker-1.12-no.json
@@ -4,7 +4,7 @@
         "images": [
             {
                 "name": "docker",
-                "reference": "18.04"
+                "reference": "18.05"
             }
         ]
     }
diff --git a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-0.1.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-0.1.3-r2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-0.1.3-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-0.1.3-r2.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest
index f37eda8ab9..c6d3d0a16e 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest
@@ -1,4 +1,3 @@
 DIST docker-proxy-0.8.0_p20161019.tar.gz 2112423 SHA256 170d355ad613cc28245a6d9501bcaba930cb594a632fdd9bd52a4fa90b406932 SHA512 a7b040cdeaf15054d436b184370af0f9b23a5b6d0b2c01530b7ad539040186888bb030309e18a1a02ad252753cf4f08aa5e5ec504480a8ffb7050db76764db5b WHIRLPOOL 83fed4162e1fbe2a640dfb720ca85583f923166d0f7da3e397ec20a333dddc42d7def2231de8877569cb63bb37435d23f772413ffd6d82f8a4a8c453d75f669c
 DIST docker-proxy-0.8.0_p20170917.tar.gz 2177045 SHA256 2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6 SHA512 673ea638fa5c560d8238d7c1d88f114430f9d8efe701804bfe30044d0c059a688cbf6b62922be50834e16ee055ef6cf015f6232f76f0d942768f9e84e95496cd WHIRLPOOL 27b33b36bbdeaff3d25977b50aa11fc5a4708482f44efe583223c1aab40091e28824eda6eb5ac8a7f20be24ef4ddcf9b6e4a043c52c9e6953ec2c95f266fb296
-DIST docker-proxy-0.8.0_p20180314.tar.gz 2692292 SHA256 f01d6c11eccf63294c97bb7da0c98326ea7f1335ad115a45cfb6cafbe9e26011 SHA512 c33005f0281260a3dcc9dd567680068afbdb9ea6036b2847c9cd3d77e72d32e6b7d359178acbd4a2db7cc15cc53d99079a1b544bc32912dbf19f2babc670a2bd WHIRLPOOL bce3f399b1f6b2e65969b48e39a888dc7338a38fa434f812a0d8eb6465e5b3b9dc582ba0ac7d0f60dcb193f9f530bad39d6070fb3d0ec3268bc803166be24345
 DIST docker-proxy-0.8.0_p20180411.tar.gz 2695069 SHA256 117d31c100eaa50468050015a94fd2e326e59fb22c50285b794dc7dece72853f SHA512 300e197313017536f91768ba675f2ab773eb1914f8e5908f4ff5b6fc8c4f0fa5ba1653cd9f8ca26e7c466f1623716aa45a2746f862e47ca9fe9136010085f600 WHIRLPOOL 72cb012a4da2be27e0c747ad86cd14ab86998c20357becdf254aa1114f9aca4da135b1ed95ca281aa14f27a2fe2fc1199677fed719a10d342ea0ab9a9fcc8be4
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180314.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180314.ebuild
deleted file mode 100644
index 3c0135e293..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180314.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/docker/libnetwork"
-
-COREOS_GO_PACKAGE="${EGO_PN}"
-COREOS_GO_VERSION="go1.9"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS="~amd64 ~arm64"
-	inherit golang-vcs
-else
-	EGIT_COMMIT="1b91bc94094ecfdae41daa465cc0c8df37dfb3dd"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-	inherit golang-vcs-snapshot
-fi
-
-inherit coreos-go
-
-DESCRIPTION="Docker container networking"
-HOMEPAGE="https://github.com/docker/libnetwork"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RDEPEND="!<app-emulation/docker-1.13.0_rc1"
-
-RESTRICT="test" # needs dockerd
-
-src_compile() {
-	go_build "${COREOS_GO_PACKAGE}/cmd/proxy"
-}
-
-src_install() {
-	dodoc ROADMAP.md README.md CHANGELOG.md
-	newbin "${GOBIN}"/proxy docker-proxy
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5.ebuild
index 04170079b5..ce9be2da03 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5.ebuild
@@ -7,7 +7,7 @@ GITHUB_URI="github.com/opencontainers/runc"
 COREOS_GO_PACKAGE="${GITHUB_URI}"
 COREOS_GO_VERSION="go1.9"
 # the commit of runc that docker uses.
-# see https://github.com/docker/docker-ce/blob/v18.04.0-ce/components/engine/hack/dockerfile/install/runc.installer#L4
+# see https://github.com/docker/docker-ce/blob/v18.05.0-ce/components/engine/hack/dockerfile/install/runc.installer#L4
 COMMIT_ID="4fc53a81fb7c994640722ac585fa9ca548971871"
 
 inherit eutils flag-o-matic coreos-go vcs-snapshot
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 48f94f1332..73f19c6389 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,2 +1,2 @@
 DIST docker-18.03.1.tar.gz 12758590 SHA256 b05f3709844c45d49922914cf6eb71d4131d0bd5389361376ff6a86aa186f4a0 SHA512 48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10 WHIRLPOOL a3bab244645243db9c4072be3f81d22298ddf0b4b2d260bc57a7244981fe67acd4cd308e82a2bc5e2afde7b90351aac41fba4808a5b64d0eec6dc03113aed8f2
-DIST docker-18.04.0.tar.gz 12797074 SHA256 7bd16f2a97dcfaa450e42d5f5d838e490feb1db3933fa187859b487c45fee253 SHA512 83a8327c714296b769ef258c291d239195459b833c5be635ee29ecbe53597d74f064d398e4b66870e2e30be17c91ea34820fd563b0d089e862b43a4cada4963a WHIRLPOOL b73a1eef90004160cac091f55a128d07c4bce184d7917562a85aac9ffe586e8c721b6cfa13c19d1049880a6916ba01820ec381d340469a417da4d56849f582dd
+DIST docker-18.05.0.tar.gz 12822443 SHA256 cc29408b382774b9f5967ee33851e97bcb7463aa7358d60004f28b836a70ba75 SHA512 81997f32a45bf9cf7e79c936728999dac84e6c51e7ec04c7dd4f0fc1fbc837aaddd2ce4fa5e4e3eb2ee99599b005f06104b81b0fa858e59692c17398a341bfd1 WHIRLPOOL 8bceefeb401308b22a92ef2652f2ace4e3b218ea421c7b9966fe85327e4f9a862f20bb8e2accc7bcbf591f350f82e8ba0dd70df5aabe70327bb5dcacf6660176
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.04.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.05.0.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.04.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.05.0.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 3efa9d9d27..4e2dfc09a2 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
@@ -4,7 +4,7 @@
 EAPI=6
 
 COREOS_GO_PACKAGE="github.com/docker/docker-ce"
-COREOS_GO_VERSION="go1.9"
+COREOS_GO_VERSION="go1.10"
 
 if [[ ${PV} = *9999* ]]; then
 	# Docker cannot be fetched via "go get", thanks to autogenerated code
@@ -19,7 +19,7 @@ else
 	else
 		MY_PV="$PV-ce"
 	fi
-	DOCKER_GITCOMMIT="3d479c0"
+	DOCKER_GITCOMMIT="f150324"
 	SRC_URI="https://${COREOS_GO_PACKAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
@@ -66,7 +66,7 @@ RDEPEND="
 	dev-libs/libltdl
 	=app-emulation/containerd-1.0.3
 	=app-emulation/docker-runc-1.0.0_rc5[apparmor?,seccomp?]
-	=app-emulation/docker-proxy-0.8.0_p20180314
+	=app-emulation/docker-proxy-0.8.0_p20180411
 	container-init? ( >=sys-process/tini-0.13.1 )
 "
 
@@ -263,7 +263,7 @@ src_compile() {
 
 	pushd components/cli || die
 
-	# Imitating https://github.com/docker/docker-ce/blob/v18.04.0-ce/components/cli/scripts/build/.variables#L7
+	# Imitating https://github.com/docker/docker-ce/blob/v18.05.0-ce/components/cli/scripts/build/.variables#L7
 	CLI_BUILDTIME="$(date -d "@${DOCKER_BUILD_DATE}" --utc --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')"
 	# build cli
 	emake \
diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.04.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.05.ebuild
similarity index 90%
rename from sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.04.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.05.ebuild
index 897656e828..4b09ba4ea2 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.04.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.05.ebuild
@@ -11,9 +11,9 @@ KEYWORDS="amd64 arm64"
 
 # Explicitly list all packages that will be built into the image.
 RDEPEND="
-	=app-emulation/docker-18.04.0
+	=app-emulation/docker-18.05.0
 	=app-emulation/containerd-1.0.3
-	=app-emulation/docker-proxy-0.8.0_p20180314
+	=app-emulation/docker-proxy-0.8.0_p20180411
 	=app-emulation/docker-runc-1.0.0_rc5
 	=dev-libs/libltdl-2.4.6
 	=sys-process/tini-0.13.2
diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-18.04-manifest.json b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-18.05-manifest.json
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-18.04-manifest.json
rename to sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-18.05-manifest.json
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180314 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180314
deleted file mode 100644
index 9a4b4c1147..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180314
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-lang/go-1.8 dev-lang/go:1.9=
-DESCRIPTION=Docker container networking
-EAPI=6
-HOMEPAGE=https://github.com/docker/libnetwork
-IUSE=+go_version_go1_9
-KEYWORDS=amd64 arm64
-LICENSE=Apache-2.0
-RDEPEND=!<app-emulation/docker-1.13.0_rc1
-REQUIRED_USE=go_version_go1_9
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/docker/libnetwork/archive/1b91bc94094ecfdae41daa465cc0c8df37dfb3dd.tar.gz -> docker-proxy-0.8.0_p20180314.tar.gz
-_eclasses_=coreos-go	43a394c18570b3dd8dd6e74fc9853493	coreos-go-depend	0c1747ddda8ae24e0d2e88cdfddaa7d1	coreos-go-utils	c34072f13165bb85e5106cc6e082a4e1	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8ebcf01f2f2443f027fa89d261eee435