diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3-r1.ebuild
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 2861852b3f..9cf02f6be9 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
@@ -10,6 +10,7 @@ EnvironmentFile=-/run/flannel_docker_opts.env
 MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576
+TasksMax=infinity
 ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// $DOCKER_OPTS $DOCKER_CGROUPS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ
 
 [Install]
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service
index 3ef49fae25..dd73678f86 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service
@@ -10,6 +10,7 @@ Environment=TMPDIR=/var/tmp
 MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576
+TasksMax=infinity
 ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// --bridge=none --iptables=false --ip-masq=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid $DOCKER_OPTS $DOCKER_CGROUPS
 
 [Install]