diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-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 e4a9b9abfc..40905ef61f 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
@@ -13,7 +13,7 @@ CROS_WORKON_REPO="git://github.com"
 
 if [[ ${PV} == *9999 ]]; then
 	DOCKER_GITCOMMIT="unknown"
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~arm64"
 else
 	CROS_WORKON_COMMIT="786b29d4db80a6175e72b47a794ee044918ba734" # v1.7.1
 	DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.socket b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.socket
index 1d541d11b3..5a96c40f83 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.socket
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.socket
@@ -1,11 +1,13 @@
 [Unit]
 Description=Docker Socket for the API
+PartOf=docker.service
 
 [Socket]
+ListenStream=/var/run/docker.sock
 SocketMode=0660
 SocketUser=docker
 SocketGroup=docker
-ListenStream=/var/run/docker.sock
 
 [Install]
 WantedBy=sockets.target
+
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.socket b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.socket
index cc5144e2a2..648b3ed417 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.socket
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.socket
@@ -1,5 +1,6 @@
 [Unit]
 Description=Early Docker Socket for the API
+PartOf=early-docker.service
 
 [Socket]
 ListenStream=/var/run/early-docker.sock