diff --git a/acct-group/runner/runner-0.ebuild b/acct-group/forgejo-runner/forgejo-runner-0.ebuild
similarity index 100%
rename from acct-group/runner/runner-0.ebuild
rename to acct-group/forgejo-runner/forgejo-runner-0.ebuild
diff --git a/acct-group/runner/metadata.xml b/acct-group/forgejo-runner/metadata.xml
similarity index 100%
rename from acct-group/runner/metadata.xml
rename to acct-group/forgejo-runner/metadata.xml
diff --git a/acct-user/runner/runner-0.ebuild b/acct-user/forgejo-runner/forgejo-runner-0.ebuild
similarity index 88%
rename from acct-user/runner/runner-0.ebuild
rename to acct-user/forgejo-runner/forgejo-runner-0.ebuild
index 74102ff2bd..50a1f9dda1 100644
--- a/acct-user/runner/runner-0.ebuild
+++ b/acct-user/forgejo-runner/forgejo-runner-0.ebuild
@@ -9,9 +9,9 @@ DESCRIPTION="Forgejo-Runner user account"
 
 IUSE="docker podman lxc"
 
-ACCT_USER_HOME=/var/lib/runner
+ACCT_USER_HOME="/var/lib/${PN}"
 ACCT_USER_ID=-1
-ACCT_USER_GROUPS=( runner )
+ACCT_USER_GROUPS=( "${PN}" )
 
 acct-user_add_deps
 
diff --git a/acct-user/runner/metadata.xml b/acct-user/forgejo-runner/metadata.xml
similarity index 100%
rename from acct-user/runner/metadata.xml
rename to acct-user/forgejo-runner/metadata.xml
diff --git a/dev-util/forgejo-runner/files/forgejo-runner-systemd-rundir.patch b/dev-util/forgejo-runner/files/forgejo-runner-systemd-rundir.patch
deleted file mode 100644
index 0c1f5f397c..0000000000
--- a/dev-util/forgejo-runner/files/forgejo-runner-systemd-rundir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/contrib/forgejo-runner.service b/contrib/forgejo-runner.service
-index 785d35df..0cbe146d 100644
---- a/contrib/forgejo-runner.service
-+++ b/contrib/forgejo-runner.service
-@@ -8,8 +8,8 @@ ExecStart=/usr/local/bin/forgejo-runner daemon
- ExecReload=/bin/kill -s HUP $MAINPID
- 
- # This user and working directory must already exist
--User=runner 
--WorkingDirectory=/home/runner
-+User=runner
-+WorkingDirectory=/var/lib/runner
- Restart=on-failure
- TimeoutSec=0
- RestartSec=10
diff --git a/dev-util/forgejo-runner/forgejo-runner-12.7.3.ebuild b/dev-util/forgejo-runner/forgejo-runner-12.7.3.ebuild
index f0b6d75050..77a7a3dba0 100644
--- a/dev-util/forgejo-runner/forgejo-runner-12.7.3.ebuild
+++ b/dev-util/forgejo-runner/forgejo-runner-12.7.3.ebuild
@@ -31,13 +31,9 @@ DEPEND="
 "
 
 RDEPEND="
-	acct-user/runner[docker=,podman=,lxc=]
+	acct-user/${PN}[docker=,podman=,lxc=]
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-systemd-rundir.patch"
-)
-
 src_unpack() {
 	if [[ "${PV}" == *9999* ]]; then
 		git-r3_src_unpack
@@ -47,6 +43,17 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	default
+
+	sed \
+		-e "/ExecStart=/s#=.*#=${EPREFIX}/usr/bin/forgejo-runner daemon -c %h/runner-config.yml#g" \
+		-e "/ExecReload=/s#=#=${EPREFIX}#g" \
+		-e "/User=/s#=.*#=${PN}#g" \
+		-e '/WorkingDirectory=/s#=.*#/=~#g' \
+		-i contrib/forgejo-runner.service || die
+}
+
 src_compile() {
 	# export version information
 	# https://github.com/gentoo/guru/pull/205
diff --git a/dev-util/forgejo-runner/forgejo-runner-9999.ebuild b/dev-util/forgejo-runner/forgejo-runner-9999.ebuild
index 1a2f5e40b8..ab2a3ecc22 100644
--- a/dev-util/forgejo-runner/forgejo-runner-9999.ebuild
+++ b/dev-util/forgejo-runner/forgejo-runner-9999.ebuild
@@ -31,13 +31,9 @@ DEPEND="
 "
 
 RDEPEND="
-	acct-user/runner[docker=,podman=,lxc=]
+	acct-user/${PN}[docker=,podman=,lxc=]
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-systemd-rundir.patch"
-)
-
 src_unpack() {
 	if [[ "${PV}" == *9999* ]]; then
 		git-r3_src_unpack
@@ -47,6 +43,17 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	default
+
+	sed \
+		-e "/ExecStart=/s#=.*#=${EPREFIX}/usr/bin/forgejo-runner daemon -c %h/runner-config.yml#g" \
+		-e "/ExecReload=/s#=#=${EPREFIX}#g" \
+		-e "/User=/s#=.*#=${PN}#g" \
+		-e '/WorkingDirectory=/s#=.*#/=~#g' \
+		-i contrib/forgejo-runner.service || die
+}
+
 src_compile() {
 	# export version information
 	# https://github.com/gentoo/guru/pull/205