diff --git a/sys-auth/keystone/files/keystone.logrotate b/sys-auth/keystone/files/keystone.logrotate
new file mode 100644
index 0000000000..2709c72aa7
--- /dev/null
+++ b/sys-auth/keystone/files/keystone.logrotate
@@ -0,0 +1,8 @@
+/var/log/keystone/*.log {
+    daily
+    missingok
+    rotate 5
+    compress
+    minsize 100k
+    copytruncate
+}
\ No newline at end of file
diff --git a/sys-auth/keystone/files/keystone.tmpfile b/sys-auth/keystone/files/keystone.tmpfile
new file mode 100644
index 0000000000..70745ce2f7
--- /dev/null
+++ b/sys-auth/keystone/files/keystone.tmpfile
@@ -0,0 +1 @@
+d /run/keystone 0755 keystone keystone -
diff --git a/sys-auth/keystone/keystone-21.0.0.0_rc1.ebuild b/sys-auth/keystone/keystone-21.0.0.0_rc1-r1.ebuild
similarity index 95%
rename from sys-auth/keystone/keystone-21.0.0.0_rc1.ebuild
rename to sys-auth/keystone/keystone-21.0.0.0_rc1-r1.ebuild
index 715dc5765e..662dd4ae7c 100644
--- a/sys-auth/keystone/keystone-21.0.0.0_rc1.ebuild
+++ b/sys-auth/keystone/keystone-21.0.0.0_rc1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MYP="${P/_/}"
 PYTHON_COMPAT=( python3_{8..9} )
 
-inherit distutils-r1
+inherit distutils-r1 tmpfiles
 
 DESCRIPTION="The Openstack authentication, authorization, and service catalog"
 HOMEPAGE="
@@ -131,8 +131,8 @@ python_install_all() {
 	keepdir /etc/keystone /var/log/keystone
 	insinto /etc/keystone
 	insopts -m 0640 -o keystone -g keystone
-	doins etc/nova/keystone.conf.sample
-	doins etc/nova/policy.yaml.sample
+	doins etc/keystone.conf.sample
+	doins etc/keystone.policy.yaml.sample
 	doins etc/logging.conf.sample
 	doins etc/default_catalog.templates
 	insinto /etc/keystone/httpd
@@ -140,6 +140,11 @@ python_install_all() {
 
 	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
 
+	newtmpfiles "${FILESDIR}/keystone.tmpfile" keystone.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/keystone.logrotate" keystone.conf
+
 	rm -r "${ED}/usr/etc" || die
 }