diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.113.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.113.ebuild
index 51ac93b25d..8864d72fb9 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.113.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.113.ebuild
@@ -96,10 +96,15 @@ src_install() {
 
 	dodoc docs/TODO HACKING NEWS README
 
-	fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d
+	# relocate default configs from /etc to /usr
+	dodir /usr/share/dbus-1/system.d
+	mv "${D}"/{etc,usr/share}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf || die
+	mv "${D}"/{etc,usr/share}/polkit-1/rules.d/50-default.rules || die
+	rmdir "${D}"/etc/dbus-1/system.d "${D}"/etc/dbus-1 || die
 
+	systemd_dotmpfilesd "${FILESDIR}/polkit.conf"
 	diropts -m0700 -o polkitd -g polkitd
-	keepdir /var/lib/polkit-1
+	dodir /var/lib/polkit-1
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
@@ -108,8 +113,3 @@ src_install() {
 
 	prune_libtool_files
 }
-
-pkg_postinst() {
-	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
-	chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
-}