diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.4.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.4.1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.4.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.4.1.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 a128501970..485d5a464e 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
@@ -15,9 +15,9 @@ if [[ ${PV} == *9999 ]]; then
 	DOCKER_GITCOMMIT=""
 	KEYWORDS=""
 else
-	CROS_WORKON_COMMIT="4595d4fb03093acf87b905bebc5ba4964d7c0707" # v1.4.0
+	CROS_WORKON_COMMIT="5bc2ff8a36e9a768e8b479de4fe3ea9c9daf4121" # v1.4.1
 	DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 inherit bash-completion-r1 linux-info multilib systemd udev user cros-workon
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
index d1f8dcebb6..8814d6f761 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
@@ -109,3 +109,6 @@ dev-util/checkbashisms
 
 # Fixes a few bugs but has not yet been marked stable upstream.
 =app-arch/lbzip2-2.5
+
+# >=3.16 required by docker 1.4
+=sys-fs/btrfs-progs-3.17.1
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.18.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.18.1.ebuild
index cb66ab245d..ecbb54a069 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.18.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.18.1.ebuild
@@ -5,4 +5,4 @@ EAPI=5
 inherit coreos-kernel
 
 DESCRIPTION="CoreOS Linux kernel"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-3.18.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-3.18.1.ebuild
index 9d70d3a709..358a9fd69d 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-3.18.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-3.18.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Full sources for the Linux kernel"
 HOMEPAGE="http://www.kernel.org"
 SRC_URI="${KERNEL_URI}"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 # This ebuild is essentially equivalent to the upstream vanilla-sources