diff --git a/gui-apps/noctalia-greeter/noctalia-greeter-1.0.0.ebuild b/gui-apps/noctalia-greeter/noctalia-greeter-1.0.0.ebuild
index c7d0432cbb..c4b4dca47b 100644
--- a/gui-apps/noctalia-greeter/noctalia-greeter-1.0.0.ebuild
+++ b/gui-apps/noctalia-greeter/noctalia-greeter-1.0.0.ebuild
@@ -48,6 +48,9 @@ BDEPEND="
 src_install() {
 	meson_src_install
 
+	# remove unneeded additional scripts
+	rm "${ED}"/usr/share/${PN}/*.sh || die
+
 	keepdir /var/lib/${PN}
 	fowners greetd:greetd /var/lib/${PN}
 }
diff --git a/gui-apps/noctalia-greeter/noctalia-greeter-9999.ebuild b/gui-apps/noctalia-greeter/noctalia-greeter-9999.ebuild
index 1df6754857..2960edebfa 100644
--- a/gui-apps/noctalia-greeter/noctalia-greeter-9999.ebuild
+++ b/gui-apps/noctalia-greeter/noctalia-greeter-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit meson
+inherit meson tmpfiles
 
 DESCRIPTION="A minimal login greeter for greetd that matches Noctalia Shell"
 HOMEPAGE="https://noctalia.dev/ https://github.com/noctalia-dev/noctalia-greeter"
@@ -46,6 +46,13 @@ BDEPEND="
 	dev-libs/wayland-protocols
 "
 
+src_prepare() {
+	default
+
+	# replace greetd user
+	sed -E -i 's/^(\S+\s+\S+\s+\S+\s+)greeter(\s+)greeter(\s+)/\1greetd\2greetd\3/' data/tmpfiles.d/${PN}.conf
+}
+
 src_configure() {
 	local emesonargs=(
 		-Dsystem_tomlplusplus=true
@@ -57,6 +64,12 @@ src_configure() {
 src_install() {
 	meson_src_install
 
-	keepdir /var/lib/${PN}
-	fowners greetd:greetd /var/lib/${PN}
+	# remove unneeded additional scripts
+	rm "${ED}"/usr/share/${PN}/*.sh || die
+
+	dotmpfiles data/tmpfiles.d/${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
 }