diff --git a/dev-python/pypsrp/Manifest b/dev-python/pypsrp/Manifest
index dfe9a407c..0769737b6 100644
--- a/dev-python/pypsrp/Manifest
+++ b/dev-python/pypsrp/Manifest
@@ -1,2 +1 @@
-DIST pypsrp-0.5.0.tar.gz 90604 BLAKE2B 09f542dd327ef28d73893fa98a3240817e88994725db5f7c2a92238d5b4e297120ef46f0947ea81d526d8472036b6bc13a4005902bfab68ffe2fce423eb31994 SHA512 ace5de77abc859dd8b8057848e18725b07d483bb67af74a43fc509f5f12103dc02cf71e0f5a65706955e1027e81fc100ebdb33ae70f0e4b75adb7560a03d81b9
-DIST pypsrp-0.7.0.tar.gz 377305 BLAKE2B 470d7ecee4064e7f12fc891c1ed5a7a85a8e7512a6194aa3c9d8799201f15f68c93f2cf8d8796e3c4af9ee7c45d68a8595ebc0fe6a1b3d264acaab5cf8da5c47 SHA512 8fdb636f1101c751b2f91e429d92cec68a1663a89ee367c9f3a6c410918894bdfaed43934d99de8da220386a256801be72e604f9c55953987905cb9f21b35513
+DIST pypsrp-0.8.1.tar.gz 385839 BLAKE2B 05c7dfaae1eb7ea808bb249003f16693ae6a868ffe003452c45c651eefc0008edc8f8daf0f62230d4e4cea3cb9924323f25a611335a5a2cd9231f6bed813baa4 SHA512 c0aeec5060aaa218424bf30fa7dca95a1fb8bc41b4beb42c0d8b03bd44bad6b91e44a5dd12083b0ac37462902ef5ab3977dd9c7567924f318e4e38d542421534
diff --git a/dev-python/pypsrp/metadata.xml b/dev-python/pypsrp/metadata.xml
index 6c70daa91..c390d7bc2 100644
--- a/dev-python/pypsrp/metadata.xml
+++ b/dev-python/pypsrp/metadata.xml
@@ -8,4 +8,8 @@
 	<use>
 		<flag name="credssp">Add CredSSP support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">jborean93/pypsrp</remote-id>
+		<remote-id type="pypi">pypsrp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pypsrp/pypsrp-0.5.0.ebuild b/dev-python/pypsrp/pypsrp-0.5.0.ebuild
deleted file mode 100644
index e14499903..000000000
--- a/dev-python/pypsrp/pypsrp-0.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="PowerShell Remoting Protocol and WinRM for Python"
-HOMEPAGE="https://github.com/jborean93/pypsrp"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kerberos test +credssp"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyspnego[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	credssp? ( dev-python/requests-credssp[${PYTHON_USEDEP}] )
-	kerberos? ( dev-python/gssapi[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/pypsrp/pypsrp-0.7.0.ebuild b/dev-python/pypsrp/pypsrp-0.8.1.ebuild
similarity index 76%
rename from dev-python/pypsrp/pypsrp-0.7.0.ebuild
rename to dev-python/pypsrp/pypsrp-0.8.1.ebuild
index 9613dd3d5..9af1853d2 100644
--- a/dev-python/pypsrp/pypsrp-0.7.0.ebuild
+++ b/dev-python/pypsrp/pypsrp-0.8.1.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="PowerShell Remoting Protocol and WinRM for Python"
 HOMEPAGE="https://github.com/jborean93/pypsrp"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-#dev-python/requests-credssp
-KEYWORDS="~amd64 ~amd64 ~x86"
+KEYWORDS="amd64 amd64 ~x86"
 IUSE="kerberos test +credssp"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyspnego[${PYTHON_USEDEP}]
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
deleted file mode 100644
index 69e858d43..000000000
--- a/dev-python/pyspnego/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pyspnego-0.1.3.tar.gz 94432 BLAKE2B 97e7a48b1dc606c412e068e78f3e49c43ee9460ae272cdbc1be81ed0e0d946c592478b6d6bebb37bee7aae83b76e4eeca885553746bdcd032f620c0e13c7e6be SHA512 abdc6b09d17b50c469c18c59dae66df15a26f7e302fb93bef9c0ece1d964c1bc402faed62db4f8ad9405ffff8b2b7b6c5abebbe5ba5d3d9d879904944ec9c4ab
diff --git a/dev-python/pyspnego/pyspnego-0.1.3.ebuild b/dev-python/pyspnego/pyspnego-0.1.3.ebuild
deleted file mode 100644
index 8a7f19060..000000000
--- a/dev-python/pyspnego/pyspnego-0.1.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Windows Negotiate Authentication Client and Server"
-HOMEPAGE="https://github.com/jborean93/pyspnego"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="kerberos test yaml"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	kerberos? ( dev-python/gssapi[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/ruamel-yaml[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"