diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service
index a205427619..853308fd95 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service
@@ -2,6 +2,8 @@
 Description=flannel docker export service - Network fabric for containers (System Application Container)
 Documentation=https://github.com/coreos/flannel
 PartOf=flanneld.service
+Requires=flanneld.service
+After=flanneld.service
 Before=docker.service
 
 [Service]
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service
index e50c7ed331..e6f036ffb4 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service
@@ -2,7 +2,6 @@
 Description=flannel - Network fabric for containers (System Application Container)
 Documentation=https://github.com/coreos/flannel
 After=etcd.service etcd2.service etcd-member.service
-Before=docker.service flannel-docker-opts.service
 Requires=flannel-docker-opts.service
 
 [Service]
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0-r1.ebuild