diff --git a/app-portage/virtual-appliance/Manifest b/app-portage/virtual-appliance/Manifest
index 69761b2..7b00882 100644
--- a/app-portage/virtual-appliance/Manifest
+++ b/app-portage/virtual-appliance/Manifest
@@ -1 +1,2 @@
-EBUILD virtual-appliance-2.0-r20200215.ebuild 982 BLAKE2B 8039b112b7b16f6be91aa9f8aa730d633422ea931f128153bf7a6a9697b60f9fec3e6e6c8a900875a0fb6800bcba63922cc300213b8661e55524969009ba2b04 SHA512 09043ec38588e9ae0e625965256900b2e1bb3353378cfe7921f09744f6ce1a7db7aa829d88a4cfd26aab2d8861631cd527b738617d6b3be4bcf54302b6896d3f
+DIST virtual-appliance-2.0-r20220119.tar.gz 53512 BLAKE2B bbb5f0bc34c4598072e5ba58f727d21c5fb4e1600abc619fc6dc08c0c8300184e51d38a77f5dab50c1c87b3841d04c3485425ba99524e58d976e0c79157ca9f0 SHA512 f3a8e665ed5f1e487d5092fe795697671ea7c0fd349f8f8a0f1f74f3ea544511b89da3b6db989e70a2eaa1f320ab31a02e0f9160e2fabab5748a00db2b27182a
+EBUILD virtual-appliance-2.0-r20220119.ebuild 1129 BLAKE2B d9b2b5307e4970f8326118de7d156c36b796e075c7a208937755cf1d3f5c06ccf30f2c5427f095d729b97240a0b1263fffa5d5eb0397c41834a6fd742fc39f40 SHA512 21f1301401bdd7b7e8fe3fef65943636177fc63af2ab30c4eee99c696c677337e80a7d318a6828190cb0d30d61443fc7989eedc43188f5e2b4341cf358d9bd5b
diff --git a/app-portage/virtual-appliance/virtual-appliance-2.0-r20200215.ebuild b/app-portage/virtual-appliance/virtual-appliance-2.0-r20220119.ebuild
similarity index 67%
rename from app-portage/virtual-appliance/virtual-appliance-2.0-r20200215.ebuild
rename to app-portage/virtual-appliance/virtual-appliance-2.0-r20220119.ebuild
index 3fa49cd..525e51b 100644
--- a/app-portage/virtual-appliance/virtual-appliance-2.0-r20200215.ebuild
+++ b/app-portage/virtual-appliance/virtual-appliance-2.0-r20220119.ebuild
@@ -2,15 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://dev.unitas-network.de/r/VA/virtual-appliance.git"
-EGIT_COMMIT="${PVR}"
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://dev.unitas-network.de/r/VA/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://git.unitas-network.de/VA/${PN}/archive/${PR/r/}.tar.gz -> ${P}-${PR}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
 
-inherit eutils linux-info toolchain-funcs git-r3
+
+inherit eutils linux-info toolchain-funcs
 
 DESCRIPTION="Programatically (re)create Gentoo Virtual Appliances"
-HOMEPAGE="https://bitbucket.org/marduk/virtual-appliance/wiki/Home"
+HOMEPAGE="https://git.unitas-network.de/VA/virtual-appliance"
 
 LICENSE="unknown"
 SLOT="0"
@@ -22,6 +28,8 @@ DEPEND="app-emulation/qemu
         sys-block/parted"
 RDEPEND="${DEPEND}"
 
+S=${WORKDIR}/${PN}
+
 pkg_setup() {
 	CONFIG_CHECK="BLK_DEV_NBD"
 	linux-info_pkg_setup