diff --git a/libgbinder/PKGBUILD b/libgbinder/PKGBUILD
index d022352..fc0f00f 100644
--- a/libgbinder/PKGBUILD
+++ b/libgbinder/PKGBUILD
@@ -4,25 +4,23 @@
 # This PKGBUILD is base on the AUR repo libgbinder, by Danct12 <danct12@disroot.org>
 
 pkgname='libgbinder'
-pkgver=1.1.30
+pkgver=1.1.31
 pkgrel=1
 pkgdesc='GLib-style interface to binder'
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 url='https://github.com/mer-hybris/libgbinder'
 license=('BSD')
 depends=('libglibutil' 'glib2')
-source=("${pkgname}::git+${url}.git#tag=${pkgver}")
-sha512sums=('SKIP')
+source=("${pkgname}-${pkgver}.tar.gz"::"${url}/archive/refs/tags/${pkgver}.tar.gz")
+sha512sums=('519cc015a97d6ebcb410efcbff54f01afc401de85efb0a5c1128b57f996f23b352fa5dd70f06ac5b9205c3f0770ffabfd82f367c85ca18a5012f715d09bce690')
 
 build() {
-  cd "${srcdir}/${pkgname}/"
-  make release pkgconfig KEEP_SYMBOLS=1
+  make -C "${srcdir}/${pkgname}-${pkgver}/" KEEP_SYMBOLS=1 release pkgconfig
 }
 
 package() {
-  cd "${srcdir}/${pkgname}/"
-  make install-dev DESTDIR="${pkgdir}"
+  make -C "${srcdir}/${pkgname}-${pkgver}/" DESTDIR="${pkgdir}" install-dev
 
   # license
-  install -Dm 644 "${srcdir}/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/libglibutil/PKGBUILD b/libglibutil/PKGBUILD
index 8dc082a..a411686 100644
--- a/libglibutil/PKGBUILD
+++ b/libglibutil/PKGBUILD
@@ -11,18 +11,16 @@ arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 url='https://github.com/sailfishos/libglibutil'
 license=('BSD')
 depends=('glib2')
-source=("${pkgname}::git+${url}.git#tag=${pkgver}")
-sha512sums=('SKIP')
+source=("${pkgname}-${pkgver}.tar.gz"::"${url}/archive/refs/tags/${pkgver}.tar.gz")
+sha512sums=('5b8d4b00ae149bba0b2df55d5e23910dc52ef3a7ee9162202afe4774e246e9389ba971b3d54ac0542b3678b15a3310c8d0e7536b7296d1a3b82e2ae2f021c541')
 
 build() {
-  cd "${srcdir}/${pkgname}/"
-  make release pkgconfig KEEP_SYMBOLS=1
+  make -C "${srcdir}/${pkgname}-${pkgver}/" KEEP_SYMBOLS=1 release pkgconfig
 }
 
 package() {
-  cd "${srcdir}/${pkgname}/"
-  make install-dev DESTDIR="${pkgdir}"
+  make -C "${srcdir}/${pkgname}-${pkgver}/" DESTDIR="${pkgdir}" install-dev
 
   # license
-  install -Dm 644 "${srcdir}/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/python-gbinder/PKGBUILD b/python-gbinder/PKGBUILD
index 7c5344b..a0a7f35 100644
--- a/python-gbinder/PKGBUILD
+++ b/python-gbinder/PKGBUILD
@@ -9,18 +9,19 @@ pkgrel=1
 pkgdesc='Python bindings for libgbinder'
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 url='https://github.com/erfanoabdi/gbinder-python'
+_reponame="${url##*/}"
 license=('GPL3')
 depends=('libgbinder')
 makedepends=('cython' 'python' 'python-setuptools')
-source=("${pkgname}::git+${url}.git#tag=${pkgver}")
-sha512sums=('SKIP')
+source=("${_reponame}-${pkgver}.tar.gz"::"${url}/archive/refs/tags/${pkgver}.tar.gz")
+sha512sums=('1910d6e904ac46da519064e9dc57e4059e1ea7072f2cf4b7ca0888a73701a590ff565fe9e9ca67acf94dba2a69f3138457d8b9533c2360befdd508b983f32a03')
 
 build() {
-  cd "${srcdir}/${pkgname}/"
+  cd "${srcdir}/${_reponame}-${pkgver}/"
   python setup.py build --cython
 }
 
 package() {
-  cd "${srcdir}/${pkgname}/"
+  cd "${srcdir}/${_reponame}-${pkgver}/"
   python setup.py install --prefix=/usr --root="${pkgdir}"
 }
diff --git a/waydroid/PKGBUILD b/waydroid/PKGBUILD
index a37a964..1db0093 100644
--- a/waydroid/PKGBUILD
+++ b/waydroid/PKGBUILD
@@ -13,11 +13,10 @@ url='https://github.com/waydroid/waydroid'
 license=('GPL3')
 depends=('dnsmasq' 'lxc' 'nftables' 'python' 'python-gbinder' 'python-gobject' 'which')
 optdepends=('waydroid-image: Android image for use with waydroid'
-      'python-pyclip: share clipboard with container')
-source=("${pkgname}::git+${url}.git#tag=${pkgver}")
-sha512sums=('SKIP')
+            'python-pyclip: share clipboard with container')
+source=("${pkgname}-${pkgver}.tar.gz"::"${url}/archive/refs/tags/${pkgver}.tar.gz")
+sha512sums=('2c7feb8cfe2b6e2738159d07e12f378250f5ba6a0d0f47c0ff904af934eacde193ae0fcae1cb4fb67d1687a2ffcd2864c1eea4fa5e52c19685ffad5c702359a5')
 
 package() {
-  cd "${srcdir}/${pkgname}/"
-  make install DESTDIR="${pkgdir}" USE_NFTABLES=1
+  make -C "${srcdir}/${pkgname}-${pkgver}/" install DESTDIR="${pkgdir}" USE_NFTABLES=1
 }