diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 3dde1b3..0d19b41 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,4 +1,2 @@
-DIST mongodb-src-r4.4.29.tar.gz 51483592 BLAKE2B 9d3469b78fba473aa8cf70a4649927a8b34e567a88fe4b29a3080bb4047022a457bb37ad6f8686c64929381d57e48f31dc08b8c64a33719d7deafa139df13b72 SHA512 10e75a14a7abfddc12c34d301968c85bca4a6b489e0e5f8a4fcf7cfb02ca616e63f3a98104c5fbcccca5d1d2bac1a836030f6e05768bb955bfbbdadc233d25dd
-DIST mongodb-src-r4.4.29.tar.gz.sig 833 BLAKE2B 39532d91686fe7697f629d486fc7d4f1ac2d6ee6c40d4e5aa39235e3aa16cd9a9059c097ed70411f76fe056a7a45f1425d77c56f45c8b53716873539956f43fb SHA512 5d97e616836360a878d99664be9d4b46f248feee6abb9a90c645f37f9f1cd647c8313fb573067e48af0d103c6078851dec0b156f51c365fa0a7a78e64c5cfc84
-DIST mongodb-src-r5.0.26.tar.gz 57084482 BLAKE2B 21205c6b9d6cea18c209ef7b3cdd1aaf6261aaf73950c5682e94838e3c1619312c6175232353c7ec1b0c24238ca6386fea1c0ea0084691710647a1cd77eb73bd SHA512 7551baeb65209fe193019a9a915fc89f3dd19da18968a2e11bd93d27fbb650d0fb710c5a8a45cf21739e19c334aa80039f2bfaba18b545b4962ad4f7fe29512e
-DIST mongodb-src-r5.0.26.tar.gz.sig 833 BLAKE2B 448d3c8fe2a407bcd09634f9e6e865fed47f35431f63a2e0f170d455488b4295d148e955a1bb39f9ca845341b38305404881d07f1fb179af95b5847bd3f2a4e8 SHA512 3f17da8b6d36f4f39800a4c7674a1b1adb979816b6b9e889b3d91a4d9d9d6af3591f66670a21c998ae27c3061d2ff8ab33f9d708de8f6fb056bad92c2894e6e3
+DIST mongodb-4.4.29.gh.tar.gz 51651007 BLAKE2B 9e9bd08ce87659fcf788964ec1bff80baef5bb9c2f5bd4968588511d289b9baf9fc68812f72ee89f90fb557dcc8d2ecbb3f607ca8e31c2212ec9633c0b99da37 SHA512 3c32a918c8b5587b04ee9263788c250a9bbd64f34ed2c19939e78607456215697966e596c2cfd160604b629188e4bdf3fff071db268bb3c25de3077a7c2ef335
+DIST mongodb-5.0.26.gh.tar.gz 57252091 BLAKE2B a4663a4dbac90118b56646816b178680a6bd99be6abb582fdfdb662c8ddf14eb9db18ed97260a37b2d04bf11715e6cfaa34bb12c4f4b08426e3afa90908f0b3c SHA512 efd56649006bb61070a2f255e8d843e4ddab33562ec9454afe55848dcc3ce8ee90431f70c9362b14e52c4a49a162ea3075a869a6fd71f63efdd5f4358703fea4
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index f8c3c65..1f55f5a 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -17,4 +17,7 @@
 		<flag name="mongosh">Install the MongoDB shell from <pkg>app-admin/mongosh-bin</pkg></flag>
 		<flag name="tools">Install the MongoDB tools (mongoimport, mongodump...) from <pkg>app-admin/mongo-tools</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">mongodb/mongo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-db/mongodb/mongodb-4.4.29.ebuild b/dev-db/mongodb/mongodb-4.4.29.ebuild
index 3dc150a..830acd9 100644
--- a/dev-db/mongodb/mongodb-4.4.29.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.29.ebuild
@@ -10,15 +10,15 @@ CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/mongodb-$(ver_cut 1-2).asc
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs verify-sig
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
 
-MY_P=${PN}-src-r${PV/_rc/-rc}
+MY_PV=r${PV/_rc/-rc}
+MY_P=mongo-${MY_PV}
 
 DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
 HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-SRC_URI+=" verify-sig? ( https://fastdl.mongodb.org/src/${MY_P}.tar.gz.sig )"
+SRC_URI="https://github.com/mongodb/mongo/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 -riscv"
@@ -52,7 +52,6 @@ BDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
-	verify-sig? ( =sec-keys/openpgp-keys-mongodb-$(ver_cut 1-2) )
 "
 PDEPEND="tools? ( >=app-admin/mongo-tools-100 )"
 
@@ -67,8 +66,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-no-enterprise.patch"
 )
 
-S="${WORKDIR}/${MY_P}"
-
 python_check_deps() {
 	if use test; then
 		python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
@@ -106,7 +103,7 @@ src_configure() {
 	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
 	# --use-system-icu fails tests
 	# --use-system-tcmalloc is strongly NOT recommended:
-	# --modules="" is to remove features tied to enterprise license
+	# for MONGO_GIT_HASH use GitOrigin-RevId from the commit of the tag
 	scons_opts=(
 		AR="$(tc-getAR)"
 		CC="$(tc-getCC)"
@@ -115,7 +112,8 @@ src_configure() {
 
 		VERBOSE=1
 		VARIANT_DIR=gentoo
-		--modules=""
+		MONGO_VERSION="${PV}"
+		MONGO_GIT_HASH="f4dda329a99811c707eb06d05ad023599f9be263"
 
 		--disable-warnings-as-errors
 		--use-system-boost
diff --git a/dev-db/mongodb/mongodb-5.0.26.ebuild b/dev-db/mongodb/mongodb-5.0.26.ebuild
index d74cf3a..f40515d 100644
--- a/dev-db/mongodb/mongodb-5.0.26.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.26.ebuild
@@ -10,15 +10,15 @@ CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/mongodb-$(ver_cut 1-2).asc
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs verify-sig
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
 
-MY_P=${PN}-src-r${PV/_rc/-rc}
+MY_PV=r${PV/_rc/-rc}
+MY_P=mongo-${MY_PV}
 
 DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
 HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-SRC_URI+=" verify-sig? ( https://fastdl.mongodb.org/src/${MY_P}.tar.gz.sig )"
+SRC_URI="https://github.com/mongodb/mongo/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
@@ -55,7 +55,6 @@ BDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
-	verify-sig? ( =sec-keys/openpgp-keys-mongodb-$(ver_cut 1-2) )
 "
 PDEPEND="
 	mongosh? ( app-admin/mongosh-bin )
@@ -76,8 +75,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.29-no-enterprise.patch"
 )
 
-S="${WORKDIR}/${MY_P}"
-
 python_check_deps() {
 	python_has_version -b ">=dev-build/scons-3.1.1[${PYTHON_USEDEP}]" &&
 	python_has_version -b "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
@@ -119,6 +116,7 @@ src_configure() {
 	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
 	# --use-system-icu fails tests
 	# --use-system-tcmalloc is strongly NOT recommended:
+	# for MONGO_GIT_HASH use GitOrigin-RevId from the commit of the tag
 	scons_opts=(
 		AR="$(tc-getAR)"
 		CC="$(tc-getCC)"
@@ -127,7 +125,8 @@ src_configure() {
 
 		VERBOSE=1
 		VARIANT_DIR=gentoo
-		--modules=""
+		MONGO_VERSION="${PV}"
+		MONGO_GIT_HASH="0b4f1ea980b5380a66425a90b414106a191365f4"
 
 		--disable-warnings-as-errors
 		--jobs="$(makeopts_jobs)"
@@ -204,4 +203,3 @@ pkg_postinst() {
 	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
 	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
 }
-