diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/files/polkit.conf b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/files/polkit.conf
new file mode 100644
index 0000000000..9734ff4ba6
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/files/polkit.conf
@@ -0,0 +1,3 @@
+d   /etc/polkit-1           -       -       -       -   -
+d   /etc/polkit-1/rules.d   0700    polkitd root    -   -
+d   /var/lib/polkit-1       0700    polkitd polkitd -   -
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.119-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.119-r2.ebuild
index 280850854a..5acbca3381 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.119-r2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.119-r2.ebuild
@@ -119,6 +119,16 @@ src_compile() {
 src_install() {
 	default
 
+	dodir /usr/share/polkit-1/rules.d
+	dodir /usr/lib/pam.d
+
+	mv "${D}"/{etc,usr/share}/polkit-1/rules.d/50-default.rules || die
+	mv "${D}"/{etc,usr/lib}/pam.d/polkit-1 || die
+	rmdir "${D}"/etc/polkit-1/rules.d "${D}"/etc/polkit-1 || die
+	rmdir "${D}"/etc/pam.d || die
+
+	systemd_dotmpfilesd "${FILESDIR}/polkit.conf"
+
 	if use examples; then
 		docinto examples
 		dodoc src/examples/{*.c,*.policy*}
@@ -129,8 +139,3 @@ src_install() {
 
 	find "${ED}" -name '*.la' -delete || die
 }
-
-pkg_postinst() {
-	chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
-	chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
-}