diff --git a/net-mail/stalwart-cli/metadata.xml b/net-mail/stalwart-cli/metadata.xml
index 6cab649acb8de..441e2e14047fa 100644
--- a/net-mail/stalwart-cli/metadata.xml
+++ b/net-mail/stalwart-cli/metadata.xml
@@ -5,4 +5,7 @@
     <email>lordvan@gentoo.org</email>
     <name>Thomas Raschbacher</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">stalwartlabs/mail-server</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-mail/stalwart-cli/stalwart-cli-0.10.7.ebuild b/net-mail/stalwart-cli/stalwart-cli-0.10.7.ebuild
index 395a43578de98..f875c62bcaa72 100644
--- a/net-mail/stalwart-cli/stalwart-cli-0.10.7.ebuild
+++ b/net-mail/stalwart-cli/stalwart-cli-0.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Autogenerated by pycargoebuild 0.13.4
@@ -746,19 +746,18 @@ SRC_URI="https://github.com/stalwartlabs/mail-server/archive/refs/tags/v${PV}.ta
 "
 # rename to same as stalwart-mail as it is the same tarball
 
+S="${WORKDIR}/mail-server-${PV}"
+
 LICENSE="|| ( AGPL-3 )"
 # Dependent crate licenses
 LICENSE+="
 	AGPL-3 Apache-2.0 BSD-2 BSD Boost-1.0 CC0-1.0 ISC LGPL-2+ MIT
 	MPL-2.0 Unicode-3.0 ZLIB
 "
+
 SLOT="0"
 KEYWORDS="~amd64"
 
-IUSE=""
-
-S="${WORKDIR}/mail-server-${PV}"
-
 src_compile() {
 	cargo_src_compile --bin stalwart-cli
 }