diff --git a/sys-apps/systemd-utils/files/tmp.conf b/sys-apps/systemd-utils/files/tmp.conf
new file mode 100644
index 0000000000000..9f3d19bb7a2d5
--- /dev/null
+++ b/sys-apps/systemd-utils/files/tmp.conf
@@ -0,0 +1,2 @@
+q /tmp 1777 root root
+q /var/tmp 1777 root root
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
similarity index 99%
rename from sys-apps/systemd-utils/systemd-utils-254.10.ebuild
rename to sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index 93436b880f05b..80c11bee8adc5 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -517,8 +517,8 @@ multilib_src_install_all() {
 		insinto /usr/share/zsh/site-functions
 		doins shell-completion/zsh/_systemd-tmpfiles
 		insinto /usr/lib/tmpfiles.d
-		doins tmpfiles.d/{tmp,x11}.conf
-		doins "${FILESDIR}"/legacy.conf
+		doins tmpfiles.d/x11.conf
+		doins "${FILESDIR}"/{legacy,tmp}.conf
 	fi
 	if use udev; then
 		doheader src/libudev/libudev.h
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8-r1.ebuild
similarity index 99%
rename from sys-apps/systemd-utils/systemd-utils-254.8.ebuild
rename to sys-apps/systemd-utils/systemd-utils-254.8-r1.ebuild
index b73e1d640a894..bbe8dec823b34 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8-r1.ebuild
@@ -518,8 +518,8 @@ multilib_src_install_all() {
 		insinto /usr/share/zsh/site-functions
 		doins shell-completion/zsh/_systemd-tmpfiles
 		insinto /usr/lib/tmpfiles.d
-		doins tmpfiles.d/{tmp,x11}.conf
-		doins "${FILESDIR}"/legacy.conf
+		doins tmpfiles.d/x11.conf
+		doins "${FILESDIR}"/{legacy,tmp}.conf
 	fi
 	if use udev; then
 		doheader src/libudev/libudev.h
diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
index b258f57482435..a4f60f47e7f33 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
@@ -517,8 +517,8 @@ multilib_src_install_all() {
 		insinto /usr/share/zsh/site-functions
 		doins shell-completion/zsh/_systemd-tmpfiles
 		insinto /usr/lib/tmpfiles.d
-		doins tmpfiles.d/{tmp,x11}.conf
-		doins "${FILESDIR}"/legacy.conf
+		doins tmpfiles.d/x11.conf
+		doins "${FILESDIR}"/{legacy,tmp}.conf
 	fi
 	if use udev; then
 		doheader src/libudev/libudev.h