diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1-r4.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1-r3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1-r4.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1.ebuild
index 8033fda479..b8d09d0d8b 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1.ebuild
@@ -32,6 +32,7 @@ src_compile() {
 
 src_install() {
 	dosbin ${S}/systemd-rest
+	keepdir /var/lib/${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	systemd_enable_service multi-user.target ${PN}.service
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-9999.ebuild
index 40fb3e5a39..54a1bdd107 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-9999.ebuild
@@ -31,6 +31,7 @@ src_compile() {
 
 src_install() {
 	dosbin ${S}/systemd-rest
+	keepdir /var/lib/${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	systemd_enable_service multi-user.target ${PN}.service
 }
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 6072bfb398..7473b4cb8b 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
@@ -32,9 +32,8 @@ src_compile() {
 
 src_install() {
 	dobin ${S}/bin/${PN}
-	dodir /var/lib/docker
-	dodir /var/lib/docker/graph
-	dodir /var/lib/docker/containers
+	keepdir /var/lib/${PN}/graph
+	keepdir /var/lib/${PN}/containers
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	systemd_enable_service multi-user.target ${PN}.service
 }