diff --git a/www-servers/jellyfin-bin/Manifest b/www-servers/jellyfin-bin/Manifest
index 084197d..6145024 100644
--- a/www-servers/jellyfin-bin/Manifest
+++ b/www-servers/jellyfin-bin/Manifest
@@ -4,3 +4,6 @@ DIST jellyfin-bin-10.6.4-web.deb 30548488 BLAKE2B 59061f90afcf1215a6ff65868dc5fa
 DIST jellyfin-bin-10.7.0_rc2-server-amd64.deb 37858932 BLAKE2B ed77e3f3b31a8096431b0631891470a34bf6f9d2366321cb789e3f1ee8d6ba4ffe8f2c98ee57aff6f5e64a0aab53be87ddf07761a6054cadf40a4ec422f7f635 SHA512 ac0f91588f33e058648c7c40f7f3b1bdc2e2d377a908b0677488bbe1849749b574e494f35abfe7c7a0cf0fa2b2de7fe3aa8eb805a746433e384b5414dcbe0509
 DIST jellyfin-bin-10.7.0_rc2-server-arm64.deb 33819332 BLAKE2B af2290272142684958705529111a16dd052e0c407ddb17220d7caf8ecceac593b3a8478d35a00e11a9d18acc39a94ad7689c750cc5b82ec0d3fb1513c469bf6d SHA512 e4578386cec1d88e2300e44fb59fb90ed9bbbcdbdd4218466118446d40b0c8f94ad886df0cb1b5c63a00949ea89315dd968b4b9f494428d1f0887643e48ed64b
 DIST jellyfin-bin-10.7.0_rc2-web.deb 35040832 BLAKE2B a0027e83aa19135df7588dae7538635c56cc75be142f4d58c7b908633284b3294cbacc9990f21d3f448b007a4def22f610917a57bc0a4721c65e26c8753c7717 SHA512 2e5f8a27cd1aaa138ce94c6f4f6a1415dbbc813c6005c57791fddfd0cc5bde8c21cbc13b8c6d238c5ebe0bd1186b3b5cbd4463b876de794ab6d78ca0e452125e
+DIST jellyfin-bin-10.7.0_rc3-server-amd64.deb 37863400 BLAKE2B 424e88a47966fccd31e061c225f57ea41e087f54c269fd002287ce7871bf2c4a0caddb45098625a3b84aa9b2b135d5289a683cae7e91993a7feccdea74ad9c4c SHA512 0d38afdb8886e6d1f264cb2e5612b70947713f67b9fe7082d69c4d2e2ce45dc32c672c15ff3e58295d2995a47fb2d355cecbf2427facb64e3175ed6c86ccc535
+DIST jellyfin-bin-10.7.0_rc3-server-arm64.deb 33821328 BLAKE2B 8b39b56c5e58379dcca9db95ef582f6858bc69bfe0a076e92698e5439135a3aaf286e1abc1390baa6808bc9cad3dbc322f440e2fc52e8d78ed721e280e5e95b0 SHA512 c18046c10d04b4733eb570bf34a1c0304947342de0c3bcf0cc50308a74bf2c44778e408749fa71e99fc56b29f8434ecb89bc787d867f9b0835e4f893dc84fc86
+DIST jellyfin-bin-10.7.0_rc3-web.deb 35040916 BLAKE2B 020a8eb2a0d3e96ad5bd0116a27e46eadb0299864e03c005b19c864f8a221ca64b084a9e4122896eafea5319a2753d529a86e37c291bf12a9f0a5039637a4eb3 SHA512 def426e4a9fb883688c6134b4cf48ee4f75f3146357d5a8c3de7ad77b74e39ca4ff9d5ebadfd2582907099b558c143c7f24f86041eb3448851bad6c36a0bf496
diff --git a/www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild b/www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild
index 15c9ff2..0049f0d 100644
--- a/www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild
+++ b/www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-BASE_URI="https://repo.jellyfin.org/releases/server/debian/versions/stable"
 MY_PN="${PN/-bin}"
 
 if [[ "${PV}" == *_rc* ]]; then
@@ -11,13 +10,17 @@ if [[ "${PV}" == *_rc* ]]; then
 	MY_PV="${PV/_rc/~rc}"
 	SRV_SRC="${MY_PN}-server_${MY_PV}"
 	WEB_SRC="${MY_PN}-web_${MY_PV}"
+	RELEASE="stable-rc"
 else
 	# Add "-1"
 	MY_PV="${PV}"
 	SRV_SRC="${MY_PN}-server_${MY_PV}-1"
 	WEB_SRC="${MY_PN}-web_${MY_PV}-1"
+	RELEASE="stable"
 fi
 
+BASE_URI="https://repo.jellyfin.org/releases/server/debian/versions/${RELEASE}"
+
 inherit unpacker systemd wrapper
 
 DESCRIPTION="The Free Software Media System"
diff --git a/www-servers/jellyfin-bin/jellyfin-bin-10.7.0_rc2.ebuild b/www-servers/jellyfin-bin/jellyfin-bin-10.7.0_rc2.ebuild
index 15c9ff2..0049f0d 100644
--- a/www-servers/jellyfin-bin/jellyfin-bin-10.7.0_rc2.ebuild
+++ b/www-servers/jellyfin-bin/jellyfin-bin-10.7.0_rc2.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-BASE_URI="https://repo.jellyfin.org/releases/server/debian/versions/stable"
 MY_PN="${PN/-bin}"
 
 if [[ "${PV}" == *_rc* ]]; then
@@ -11,13 +10,17 @@ if [[ "${PV}" == *_rc* ]]; then
 	MY_PV="${PV/_rc/~rc}"
 	SRV_SRC="${MY_PN}-server_${MY_PV}"
 	WEB_SRC="${MY_PN}-web_${MY_PV}"
+	RELEASE="stable-rc"
 else
 	# Add "-1"
 	MY_PV="${PV}"
 	SRV_SRC="${MY_PN}-server_${MY_PV}-1"
 	WEB_SRC="${MY_PN}-web_${MY_PV}-1"
+	RELEASE="stable"
 fi
 
+BASE_URI="https://repo.jellyfin.org/releases/server/debian/versions/${RELEASE}"
+
 inherit unpacker systemd wrapper
 
 DESCRIPTION="The Free Software Media System"
diff --git a/www-servers/jellyfin-bin/jellyfin-bin-10.7.0_rc3.ebuild b/www-servers/jellyfin-bin/jellyfin-bin-10.7.0_rc3.ebuild
new file mode 100644
index 0000000..0049f0d
--- /dev/null
+++ b/www-servers/jellyfin-bin/jellyfin-bin-10.7.0_rc3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-bin}"
+
+if [[ "${PV}" == *_rc* ]]; then
+	# _rc -> ~rc
+	MY_PV="${PV/_rc/~rc}"
+	SRV_SRC="${MY_PN}-server_${MY_PV}"
+	WEB_SRC="${MY_PN}-web_${MY_PV}"
+	RELEASE="stable-rc"
+else
+	# Add "-1"
+	MY_PV="${PV}"
+	SRV_SRC="${MY_PN}-server_${MY_PV}-1"
+	WEB_SRC="${MY_PN}-web_${MY_PV}-1"
+	RELEASE="stable"
+fi
+
+BASE_URI="https://repo.jellyfin.org/releases/server/debian/versions/${RELEASE}"
+
+inherit unpacker systemd wrapper
+
+DESCRIPTION="The Free Software Media System"
+HOMEPAGE="https://jellyfin.org"
+SRC_URI="
+	amd64? (
+		${BASE_URI}/server/${MY_PV}/${SRV_SRC}_amd64.deb -> ${P}-server-amd64.deb
+	)
+	arm64? (
+		${BASE_URI}/server/${MY_PV}/${SRV_SRC}_arm64.deb -> ${P}-server-arm64.deb
+	)
+	${BASE_URI}/web/${MY_PV}/${WEB_SRC}_all.deb -> ${P}-web.deb
+"
+
+RESTRICT="mirror"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+
+DEPEND="
+	!www-servers/jellyfin
+"
+RDEPEND="
+	${DEPEND}
+	>=media-video/ffmpeg-4.2.2
+	acct-group/jellyfin
+	acct-user/jellyfin
+	dev-db/sqlite
+	dev-util/lttng-ust
+	media-libs/fontconfig
+	media-libs/freetype
+"
+
+QA_PREBUILT="usr/lib/${MY_PN}/bin/*"
+QA_PRESTRIPPED="${QA_PRESTRIPPED}"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}/${MY_PN}-default.patch"
+)
+
+src_unpack() {
+	# https://gitlab.com/src_prepare/src_prepare-overlay/-/merge_requests/145
+	if use amd64
+	then
+		unpack_deb "${P}-server-amd64.deb"
+	elif use arm64
+	then
+		unpack_deb "${P}-server-arm64.deb"
+	else
+		die "Unsupported architecture"
+	fi
+	unpack_deb "${P}-web.deb"
+}
+
+src_install() {
+	# Install the Server part
+	insinto usr/lib/
+	doins -r "usr/lib/${MY_PN}"
+	insinto etc
+	doins -r "etc/${MY_PN}"
+
+	# Install the Web UI part
+	insinto "usr/share/${MY_PN}/web"
+	doins -r "usr/share/${MY_PN}/web"/*
+
+	# Install wrappers
+	make_wrapper "${MY_PN}" "${EPREFIX}/usr/lib/${MY_PN}/bin/${MY_PN}"
+	dosym "${EPREFIX}/usr/bin/${MY_PN}" "${EPREFIX}/usr/bin/${PN}"
+
+	# Install services
+	newinitd "${FILESDIR}/${MY_PN}" "${MY_PN}"
+	doconfd "etc/default/${MY_PN}"
+	dosym "${EPREFIX}/etc/conf.d/${MY_PN}" "${EPREFIX}/etc/default/${MY_PN}"
+	systemd_dounit "lib/systemd/system/${MY_PN}.service"
+	systemd_install_serviced "etc/systemd/system/${MY_PN}.service.d/${MY_PN}.service.conf"
+
+	# Fix permissions
+	chmod +x "${ED}/usr/lib/${MY_PN}"/* || die
+	chmod +x "${ED}/usr/lib/${MY_PN}/bin"/* || die
+	chown -R jellyfin:jellyfin "${ED}/usr/lib/${MY_PN}" || die
+}