diff --git a/metadata/md5-cache/www-apps/beszel-hub-0.18.3 b/metadata/md5-cache/www-apps/beszel-hub-0.18.3
new file mode 100644
index 0000000..c08d563
--- /dev/null
+++ b/metadata/md5-cache/www-apps/beszel-hub-0.18.3
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile unpack
+DESCRIPTION=Beszel Hub - Simple, lightweight server monitoring
+EAPI=8
+HOMEPAGE=https://www.beszel.dev/
+INHERIT=go-module systemd toolchain-funcs
+KEYWORDS=~amd64
+LICENSE=AGPL-3+ AGPL-3 Apache-2.0 BSD GPL-3+ ISC MIT MPL-2.0 public-domain
+SLOT=0
+SRC_URI=https://github.com/henrygd/beszel/archive/refs/tags/v0.18.3.tar.gz -> beszel-hub-0.18.3.tar.gz https://gentoo-overlay.friedli.info/beszel-0.18.3-vendor.tar.xz
+_eclasses_=multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	30214924c0c3b92ec7dbf24fc70d60d3	flag-o-matic	a7afe42e95fb46ce9691605acfb24672	go-env	0e2babf96e7d0b045fc07ad199eb2399	go-module	d96f2a2fd6d8fbad6d94516bf238f885	systemd	a964c0cbe818b5729da1dbfcee5be861
+_md5_=75b7c6991f6b5618d163e53101970b53
diff --git a/www-apps/beszel-hub/Manifest b/www-apps/beszel-hub/Manifest
index 329fc7e..49b17df 100644
--- a/www-apps/beszel-hub/Manifest
+++ b/www-apps/beszel-hub/Manifest
@@ -1,2 +1,3 @@
-DIST beszel-hub-0.18.2.tar.gz 1147048 BLAKE2B 342b75f4c5badb115d3ec06f9a680ae2b9719e487ce4f11fee4af7ccc2342a197b63bce683d9ece37fa65e13328ae4ea5bc562de4a5059656b32d5110760e28e SHA512 1c4d4c1d1a6e5a0cf07cffaef5a7fa44c4cf97d0b5befe6cca1f21d25b1e5228b3e4c455719a709da882fde3c88529693f16ed7ebc9cd463e7f8ab00265b4d8f
-EBUILD beszel-hub-0.18.2.ebuild 561 BLAKE2B f57480d791fe83187f40d3287bdb1e1d5190aa9e608211050ab84d762dddd8dbd01757d7e47ed8ba49bd19fa273588fbcdc67a2f5a7d8f35831dc443d9bb6c9c SHA512 2fdd378326d9273e2fb8d96dc4bc669a198192c77ea6071d96df01a86d8be4b045804879fbe8d99d77396cd23f6eadf3f6ba3b0be5e6b0df210e856a4c36aec5
+DIST beszel-0.18.3-vendor.tar.xz 29845172 BLAKE2B 7c1e7e40c60614553dfa312d1891a677a987be5191447670d14f07b0a95933d2b9884b11b6914e74d20166a9be20bf6e3a86f1d6f296cd953d049ed17bc4631a SHA512 b959211fcd7e3a8c5abb3d46dedca883fbd85493f502d716538d0c76bfa08796e40dd8000306f8f9dcfb20e3886847d272a695553e669910168a059ecd31b461
+DIST beszel-hub-0.18.3.tar.gz 1153782 BLAKE2B 13458446ed3d80c9409161bc17b54fbde6dc5da6cbf9d65c42a65c5ec236e34dcc7fe131173cb08cc9b5df30b435952bd36c643a87a29fd8a65d5b844de62aa5 SHA512 c4abbe9b28b79ec3206b401b29fcc6c49531c9b2e946909df11d3ac8430099d455d391e49d67503f8fa831b6c514d5efb7f67845f1ab4788e81ff80a9a4521cf
+EBUILD beszel-hub-0.18.3.ebuild 873 BLAKE2B 8511c4a6cd9e037b9277cfe0b91be1899d8aaa21eb79e098feffc7864a9beb943912c267f137f9419e1acb49afb4ba6b93f613b18e50b94c6e5104dfd7ae553e SHA512 e3d4c24fd5dfb62fc5e271b30c05c0b68ed1a47bccf7daa9a65bbba38fe05193ab382bee3573bf470f6b2de0628757327c74698ab5e70fdeb9f16eaa2d561c1d
diff --git a/www-apps/beszel-hub/beszel-hub-0.18.2.ebuild b/www-apps/beszel-hub/beszel-hub-0.18.2.ebuild
deleted file mode 100644
index 29864c9..0000000
--- a/www-apps/beszel-hub/beszel-hub-0.18.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2022-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd toolchain-funcs
-
-DESCRIPTION="Simple, lightweight server monitoring"
-HOMEPAGE="https://www.beszel.dev/"
-SRC_URI="https://github.com/henrygd/beszel/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/beszel-${PV}"
-
-LICENSE="AGPL-3+"
-# Go dependency licenses
-LICENSE+=" AGPL-3 Apache-2.0 BSD GPL-3+ ISC MIT MPL-2.0 public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_compile() {
-#	emake build-hub
-	emake build-agent
-}
diff --git a/www-apps/beszel-hub/beszel-hub-0.18.3.ebuild b/www-apps/beszel-hub/beszel-hub-0.18.3.ebuild
new file mode 100644
index 0000000..6877653
--- /dev/null
+++ b/www-apps/beszel-hub/beszel-hub-0.18.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd toolchain-funcs
+
+MY_P="beszel-${PV}"
+DESCRIPTION="Beszel Hub - Simple, lightweight server monitoring"
+HOMEPAGE="https://www.beszel.dev/"
+
+# How to create the site tarball:
+# - Checkout the repo at the correct tag
+# cd internal/site
+# npm install
+# npm build
+# cd ../..
+# tar --auto-compress -cf ${MY_P}-site.tar.xz internal/site/dist
+# Upload to mirror
+SRC_URI="https://github.com/henrygd/beszel/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gentoo-overlay.friedli.info/${MY_P}-vendor.tar.xz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="AGPL-3+"
+# Go dependency licenses
+LICENSE+=" AGPL-3 Apache-2.0 BSD GPL-3+ ISC MIT MPL-2.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+
+	cd internal/hub
+	ego build -ldflags "-w -s"
+}