diff --git a/app-misc/aw-client/Manifest b/app-misc/aw-client/Manifest
new file mode 100644
index 0000000000..e96d0f11ae
--- /dev/null
+++ b/app-misc/aw-client/Manifest
@@ -0,0 +1 @@
+DIST aw-client-0.11.0.tar.gz 45734 BLAKE2B d377a261fd74d6b0722e55da6d5c3c6f11a18463fca085fcfaaba193fd4c047385b1bd133b95726aa857e090cbe65bfc97f8b2a4926a3f89e88e16e2527c8e78 SHA512 93baaeb4cc5792a0256d70563a7d779543e64f952daa02beaf69af1d00d7741ecc62109696a600c9698a8de89c62e933910a9fb80ca2f0928b122d33414635df
diff --git a/app-misc/aw-client/aw-client-0.11.0.ebuild b/app-misc/aw-client/aw-client-0.11.0.ebuild
index 85b6314560..edf5bd808a 100644
--- a/app-misc/aw-client/aw-client-0.11.0.ebuild
+++ b/app-misc/aw-client/aw-client-0.11.0.ebuild
@@ -12,15 +12,16 @@ DESCRIPTION="Client library for ActivityWatch"
 HOMEPAGE="https://activitywatch.net"
 LICENSE="MPL-2.0"
 
-inherit git-r3
-EGIT_REPO_URI="https://github.com/ActivityWatch/${PN}.git"
-EGI_COMMIT="f7a8dbb3f81be81224368970054fd33d2814c9d7"
+COMMIT="f7a8dbb3f81be81224368970054fd33d2814c9d7"
+SRC_URI="https://github.com/ActivityWatch/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS=""
+KEYWORDS="~amd64"
 SLOT="0"
 # Test tries to connect to aw-server
 RESTRICT="test"
 
+S="${WORKDIR}/${PN}-${COMMIT}"
+
 RDEPEND="
 	app-misc/aw-core[${PYTHON_USEDEP}]
 	dev-python/click[${PYTHON_USEDEP}]
diff --git a/app-misc/aw-core/Manifest b/app-misc/aw-core/Manifest
new file mode 100644
index 0000000000..fa5c04de2f
--- /dev/null
+++ b/app-misc/aw-core/Manifest
@@ -0,0 +1 @@
+DIST aw-core-0.11.0.tar.gz 74757 BLAKE2B 192d5a101e9e01e8de65a5c2aa20a9636ff0476d294951f765b344889ff41ac2dbb0c8b5d2d1b884f96c963219541088b629794f1cf97c9b41c6bda29235c3ec SHA512 4d48d8debb12530c78ef09b1a12530bb10ab2caac4d2a7da1c642afffe26f08b9db60c21576b5d711fd10e47c9b905dbd3a2fb5f72998077e5f7393f9c6edde6
diff --git a/app-misc/aw-core/aw-core-0.11.0.ebuild b/app-misc/aw-core/aw-core-0.11.0.ebuild
index 34e0cdad06..471deb1d49 100644
--- a/app-misc/aw-core/aw-core-0.11.0.ebuild
+++ b/app-misc/aw-core/aw-core-0.11.0.ebuild
@@ -12,14 +12,15 @@ DESCRIPTION="Core library for ActivityWatch"
 HOMEPAGE="https://activitywatch.net"
 LICENSE="MPL-2.0"
 
-inherit git-r3
-EGIT_REPO_URI="https://github.com/ActivityWatch/${PN}.git"
-EGI_COMMIT="8aaa35376a4f0b270a1927dff4b4d34caee7707b"
+COMMIT="8aaa35376a4f0b270a1927dff4b4d34caee7707b"
+SRC_URI="https://github.com/ActivityWatch/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS=""
+KEYWORDS="~amd64"
 SLOT="0"
 IUSE="test"
 
+S="${WORKDIR}/${PN}-${COMMIT}"
+
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
 	dev-python/deprecation[${PYTHON_USEDEP}]