diff --git a/app-emulation/docker/docker-1.11.2.ebuild b/app-emulation/docker/docker-1.11.2-r1.ebuild
similarity index 100%
rename from app-emulation/docker/docker-1.11.2.ebuild
rename to app-emulation/docker/docker-1.11.2-r1.ebuild
diff --git a/app-emulation/docker/files/docker.service b/app-emulation/docker/files/docker.service
index 2861852b3f..90fe9a7386 100644
--- a/app-emulation/docker/files/docker.service
+++ b/app-emulation/docker/files/docker.service
@@ -5,7 +5,6 @@ After=docker.socket early-docker.target network.target
 Requires=docker.socket early-docker.target
 
 [Service]
-Environment="DOCKER_CGROUPS=--exec-opt native.cgroupdriver=systemd"
 EnvironmentFile=-/run/flannel_docker_opts.env
 MountFlags=slave
 LimitNOFILE=1048576
diff --git a/app-emulation/docker/files/early-docker.service b/app-emulation/docker/files/early-docker.service
index d3cc785d83..d2876a1bb8 100644
--- a/app-emulation/docker/files/early-docker.service
+++ b/app-emulation/docker/files/early-docker.service
@@ -5,7 +5,6 @@ After=early-docker.socket
 Requires=early-docker.socket
 
 [Service]
-Environment="DOCKER_CGROUPS=--exec-opt native.cgroupdriver=systemd"
 Environment=TMPDIR=/var/tmp
 MountFlags=slave
 LimitNOFILE=1048576