diff --git a/acct-user/beszel-agent/Manifest b/acct-user/beszel-agent/Manifest
index 73eac73..e3b8651 100644
--- a/acct-user/beszel-agent/Manifest
+++ b/acct-user/beszel-agent/Manifest
@@ -1 +1,4 @@
+EBUILD beszel-agent-0-r1.ebuild 341 BLAKE2B bfe9ce024736a41f1f9981a3380f37c079fd7af14e697b5992609b9d412892b4001a22aca73e4a544675d118e0d9a0a61dbeaaef8e069986aa0dba5a88fd7d09 SHA512 adca3f5f0bb2276e15a235112e1dda76196000353c04242a4034a3f7151f8ae880e36959c24b9b8e464d72ed79e45cc40da541ef683317564bb25f72ab7242b7
 EBUILD beszel-agent-0.ebuild 266 BLAKE2B 51bc5ac4a69b483cc8c5ea4667cfb617b0ac2238da85eb2c92683b9018b1db59e84752bf7ad1642835ab6eff5b8a2f459304bae37a4f1da3bab5985a37b65b2f SHA512 9d18953043b590a607aa709fd736b68429f60634e16693b5b942583c12b7fc2fb6d46584f79836e1b265d540a35e6e542da377ed353fc11519803043d9802b13
+MISC beszel-agent-0-r1.ebuild~ 324 BLAKE2B 1acac77f3b90c504e178348253c4547aade77b3ba4202b44d764fd34e79813b5fe2077edb51bb3f8502cc9feb921be9bba4ab9612498b1052308854d6fb6187c SHA512 5aedc4ed4181abd86e3c3eb375fc4acb273cfb03f6396fe4e61ba7e51827655ddd5e5fa2bdf85587fd37054fe3da830b75f8d62cb1f63f9359d1e330deb8522e
+MISC metadata.xml 418 BLAKE2B 7a976f39a936b36e1cff641b9ac3d7b517a5a202f9fcca022349dce0950d2cf50850bcd686102b607da315bcc60471ce845a790ea465b77b3b81869a4a21be3e SHA512 201b80ab197ae1006f3d497f975cf74c68a8749991d3d671d6bb182e1c28dd56c45b41c1c1940a07d183a54f0df1ee32b9fcf7b310324cb2d486dd80b0996218
diff --git a/acct-user/beszel-agent/beszel-agent-0-r1.ebuild b/acct-user/beszel-agent/beszel-agent-0-r1.ebuild
new file mode 100644
index 0000000..9990b15
--- /dev/null
+++ b/acct-user/beszel-agent/beszel-agent-0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2019-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the Beszel monitoring agent"
+KEYWORDS="~amd64"
+IUSE="docker"
+
+ACCT_USER_ID=-1
+ACCT_USER_GROUPS=( beszel )
+
+pkg_setup() {
+	use docker && ACCT_USER_GROUPS+=( docker )
+}
+
+acct-user_add_deps
diff --git a/acct-user/beszel-agent/metadata.xml b/acct-user/beszel-agent/metadata.xml
new file mode 100644
index 0000000..f23ef1e
--- /dev/null
+++ b/acct-user/beszel-agent/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>manuel@fritteli.ch</email>
+		<name>Manuel Friedli</name>
+	</maintainer>
+	<use>
+		<flag name="docker">Add the user to the docker group in order to access docker stats. Beware that this will grant the user full access to docker!</flag>
+	</use>
+</pkgmetadata>
diff --git a/metadata/md5-cache/acct-user/beszel-agent-0-r1 b/metadata/md5-cache/acct-user/beszel-agent-0-r1
new file mode 100644
index 0000000..7dc1a58
--- /dev/null
+++ b/metadata/md5-cache/acct-user/beszel-agent-0-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst prerm pretend setup
+DESCRIPTION=User for the Beszel monitoring agent
+EAPI=8
+INHERIT=acct-user
+IUSE=docker
+KEYWORDS=~amd64
+RDEPEND=acct-group/beszel
+SLOT=0
+_eclasses_=user-info	d7c261c6f7c2392145e8789913f1bf7e	acct-user	8c5f04cd2cfafc30ffb9bae9cf5f5605
+_md5_=68743e0393992a8b8a9c919f1222571b