diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index b042a0c..ae58cbc 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_COMPAT=( python{3_10,3_11} )
 
-inherit autotools fcaps linux-info python-single-r1 systemd toolchain-funcs
+inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Linux real time system monitoring, done right!"
@@ -148,7 +148,10 @@ src_install() {
 	fperms 4750 /usr/libexec/netdata/plugins.d/{cgroup-network,ioping.plugin,perf.plugin,slabinfo.plugin}
 
 	newinitd system/openrc/init.d/netdata ${PN}
+	newconfd system/openrc/conf.d/netdata ${PN}
 	systemd_dounit system/systemd/netdata.service
+	systemd_dounit system/systemd/netdata-updater.service
+	systemd_dounit system/systemd/netdata-updater.timer
 	insinto /etc/netdata
 	doins system/netdata.conf
 }
@@ -167,5 +170,4 @@ pkg_postinst() {
 	if use ipmi ; then
 		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
 	fi
-
 }