diff --git a/x11-libs/ztoolkit/Manifest b/x11-libs/ztoolkit/Manifest
index 0cbca85..1a011ed 100644
--- a/x11-libs/ztoolkit/Manifest
+++ b/x11-libs/ztoolkit/Manifest
@@ -1 +1 @@
-DIST ztoolkit-0.1.2.tar.gz 166043 BLAKE2B a680cc240bb3e100b7b6c88c122ddcbd351c409bb8126a76fbe1817f70d9ce055f18bbebe1605e616a50b8f884d67ad5b85a389e4422c8d4bbcd378d5e8b183d SHA512 fc4808afcda527a80b7d4561e355dd272e710492f658f8e9f391ae8c2c88cca5fc6560aceecc8b9a8870d1d2a57bf9d72a7c3c331c807ceed1de3e0d5663aaa7
+DIST ztoolkit-0.1.2.tar.bz2 136860 BLAKE2B 6e948af6fb0bd58e12e405d682098bc40d58e925f47117f62420c02da796c7cb489a9c168c16583c83804111b6d30a525ee23b4dc5d45a6107bc2b1afc78ddbb SHA512 c738a89d2185db130f1745cb86a1746dd3eb91f8fadb1bdb448226406c5cd84f59f38f04d9cc6309f525949422a2f6156cea9f69c7deccf77afbdf34d008aa86
diff --git a/x11-libs/ztoolkit/ztoolkit-0.1.2.ebuild b/x11-libs/ztoolkit/ztoolkit-0.1.2.ebuild
index c4a7d00..7cf0c1c 100644
--- a/x11-libs/ztoolkit/ztoolkit-0.1.2.ebuild
+++ b/x11-libs/ztoolkit/ztoolkit-0.1.2.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
-if [[ ${PV} != *9999* ]]; then
-	S="${WORKDIR}/${PN}"
-	SRC_URI="https://git.zrythm.org/zrythm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-else
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.zrythm.org/zrythm/ztoolkit.git"
+	EGIT_REPO_URI="https://gitlab.zrythm.org/zrythm/ztoolkit.git"
+else
+	MY_P="${PN}-v${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://gitlab.zrythm.org/zrythm/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="GUI toolkit for LV2 plugins"
diff --git a/x11-libs/ztoolkit/ztoolkit-9999.ebuild b/x11-libs/ztoolkit/ztoolkit-9999.ebuild
index c4a7d00..7cf0c1c 100644
--- a/x11-libs/ztoolkit/ztoolkit-9999.ebuild
+++ b/x11-libs/ztoolkit/ztoolkit-9999.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
-if [[ ${PV} != *9999* ]]; then
-	S="${WORKDIR}/${PN}"
-	SRC_URI="https://git.zrythm.org/zrythm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-else
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.zrythm.org/zrythm/ztoolkit.git"
+	EGIT_REPO_URI="https://gitlab.zrythm.org/zrythm/ztoolkit.git"
+else
+	MY_P="${PN}-v${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://gitlab.zrythm.org/zrythm/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="GUI toolkit for LV2 plugins"