diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.1-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.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 6730c62093..2d17b91ed8 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
@@ -166,11 +166,7 @@ src_install() {
 	newinitd contrib/init/openrc/docker.initd docker
 	newconfd contrib/init/openrc/docker.confd docker
 
-	if use symlink-usr; then
-		systemd_dounit "${FILESDIR}/symlink-usr/docker.service"
-	else
-		systemd_dounit "${FILESDIR}/docker.service"
-	fi
+	systemd_dounit "${FILESDIR}/docker.service"
 	systemd_dounit "${FILESDIR}/docker.socket"
 
 	insinto /usr/lib/systemd/network
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service
index fc02ea45a3..174ccb9b54 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service
@@ -3,10 +3,11 @@ Description=Docker Application Container Engine
 Documentation=http://docs.docker.io
 
 [Service]
+Environment="TMPDIR=/var/tmp/"
 ExecStartPre=/bin/mount --make-rprivate /
 # Run docker but don't have docker automatically restart
 # containers. This is a job for systemd and unit files.
-ExecStart=/usr/bin/docker -d -r=false -H fd://
+ExecStart=/usr/bin/docker -d -s=btrfs -r=false -H fd://
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/symlink-usr/docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/symlink-usr/docker.service
deleted file mode 100644
index 573273272b..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/symlink-usr/docker.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Docker Application Container Engine 
-Documentation=http://docs.docker.io
-
-[Service]
-ExecStartPre=/bin/mount --make-rprivate /
-# Run docker but don't have docker automatically restart
-# containers. This is a job for systemd and unit files.
-ExecStart=/usr/bin/docker -d -s=btrfs -r=false -H fd://
-
-[Install]
-WantedBy=multi-user.target