diff --git a/net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r2.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r3.ebuild
similarity index 87%
rename from net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r2.ebuild
rename to net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r3.ebuild
index 83fcc3b84069b..e6e08ba90a4d0 100644
--- a/net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r2.ebuild
+++ b/net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r3.ebuild
@@ -39,6 +39,9 @@ src_prepare() {
 
 	# https://github.com/greenbone/ospd-openvas/pull/649
 	sed -i '/^Group=gvm/d' config/ospd-openvas.service || die
+
+	# https://github.com/greenbone/ospd-openvas/pull/653
+	sed -i 's;/usr/local/bin/;/usr/bin/;' config/ospd-openvas.service || die
 }
 
 python_compile() {
@@ -54,9 +57,11 @@ python_install() {
 
 	dodoc "${FILESDIR}"/redis.conf.example
 
-	insinto /etc/openvas
+	insinto /etc/gvm
 	doins config/${PN}.conf
-	fowners -R gvm:gvm /etc/openvas
+	if ! use prefix; then
+		fowners -R gvm:gvm /etc/gvm
+	fi
 
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"