diff --git a/firefox-syncstorage/.SRCINFO b/firefox-syncstorage/.SRCINFO
index a2814d4..5ccb692 100644
--- a/firefox-syncstorage/.SRCINFO
+++ b/firefox-syncstorage/.SRCINFO
@@ -20,7 +20,7 @@ pkgbase = firefox-syncstorage
 	depends = python-tokenlib
 	optdepends = mysql: for use with a local database server
 	backup = etc/firefox-syncstorage.toml
-	source = https://github.com/mozilla-services/syncstorage-rs/archive/0.13.0.tar.gz
+	source = https://github.com/mozilla-services/syncstorage-rs/archive/0.13.0/syncstorage-rs-0.13.0.tar.gz
 	source = firefox-syncstorage.service
 	sha256sums = 62c9922f3fc8067da511780fbdd7e41a55d18ec0790827ec253a17fcc60022a7
 	sha256sums = 609e057cd835ea54b06b32b98e210cd946255f652e7754c9160fd7c94379a83d
diff --git a/firefox-syncstorage/PKGBUILD b/firefox-syncstorage/PKGBUILD
index d2d68c0..b6ff601 100644
--- a/firefox-syncstorage/PKGBUILD
+++ b/firefox-syncstorage/PKGBUILD
@@ -15,7 +15,7 @@ depends=('openssl' 'python-fxa' 'python-tokenlib')
 makedepends=('rust' 'cmake' 'pkgconf' 'mariadb-libs')
 optdepends=('mysql: for use with a local database server')
 install="${pkgname}.install"
-source=("https://github.com/mozilla-services/${_pkgname}/archive/${pkgver}.tar.gz"
+source=("https://github.com/mozilla-services/${_pkgname}/archive/${pkgver}/${_pkgname}-${pkgver}.tar.gz"
 	"${pkgname}.service")
 sha256sums=('62c9922f3fc8067da511780fbdd7e41a55d18ec0790827ec253a17fcc60022a7'
             '609e057cd835ea54b06b32b98e210cd946255f652e7754c9160fd7c94379a83d')
diff --git a/gvisor-bin/.SRCINFO b/gvisor-bin/.SRCINFO
index ed60123..bfac273 100644
--- a/gvisor-bin/.SRCINFO
+++ b/gvisor-bin/.SRCINFO
@@ -9,12 +9,12 @@ pkgbase = gvisor-bin
 	optdepends = docker: for Docker runtime support
 	provides = gvisor
 	conflicts = gvisor
-	source_x86_64 = https://storage.googleapis.com/gvisor/releases/release/20221102.1/x86_64/runsc
-	source_x86_64 = https://storage.googleapis.com/gvisor/releases/release/20221102.1/x86_64/containerd-shim-runsc-v1
+	source_x86_64 = runsc-x86_64-20221102.1::https://storage.googleapis.com/gvisor/releases/release/20221102.1/x86_64/runsc
+	source_x86_64 = containerd-shim-runsc-v1-x86_64-20221102.1::https://storage.googleapis.com/gvisor/releases/release/20221102.1/x86_64/containerd-shim-runsc-v1
 	sha512sums_x86_64 = f47a15449cd2a4b25dc768e4d9275d67c22acda6ebbc46270c38f5f135143f7551475168862b846a408f3858ee7edf725861a6bb3ce9ef2c783d1cab6d177511
 	sha512sums_x86_64 = 3b8bb9453dfc8cad3b2a1c484d9acb6766c7900d6869e1696214216a0fab994e55409e4065267544a360283b2c824790f605d89749674ddb68dd58086f44f956
-	source_aarch64 = https://storage.googleapis.com/gvisor/releases/release/20221102.1/aarch64/runsc
-	source_aarch64 = https://storage.googleapis.com/gvisor/releases/release/20221102.1/aarch64/containerd-shim-runsc-v1
+	source_aarch64 = runsc-aarch64-20221102.1::https://storage.googleapis.com/gvisor/releases/release/20221102.1/aarch64/runsc
+	source_aarch64 = containerd-shim-runsc-v1-aarch64-20221102.1::https://storage.googleapis.com/gvisor/releases/release/20221102.1/aarch64/containerd-shim-runsc-v1
 	sha512sums_aarch64 = 87a39bb2e2e87390f6c6c38dbc4bdcced62d07af9128ddead7b0b46bc7bac2f9aa678b8bc5d234dedd9ad5430fe38d0e3df77d65b10589e99f21bdf0516d80b5
 	sha512sums_aarch64 = 0ec5bd37b91a921bdeb26e92251f37d6c6adba4e2176973017b592e229c7512aa1765be4c4a87be44dfbb6bb30827b05f7e1551eff98ea006499317dec4a9e60
 
diff --git a/gvisor-bin/PKGBUILD b/gvisor-bin/PKGBUILD
index 8d7375e..3e0d707 100644
--- a/gvisor-bin/PKGBUILD
+++ b/gvisor-bin/PKGBUILD
@@ -18,12 +18,12 @@ conflicts=(
 	"${pkgname%-bin}"
 )
 source_x86_64=(
-	"https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/x86_64/$_pkgbin"
-	"https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/x86_64/$_pkgshim"
+	"$_pkgbin-x86_64-$pkgver::https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/x86_64/$_pkgbin"
+	"$_pkgshim-x86_64-$pkgver::https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/x86_64/$_pkgshim"
 )
 source_aarch64=(
-	"https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/aarch64/$_pkgbin"
-	"https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/aarch64/$_pkgshim"
+	"$_pkgbin-aarch64-$pkgver::https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/aarch64/$_pkgbin"
+	"$_pkgshim-aarch64-$pkgver::https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/aarch64/$_pkgshim"
 )
 sha512sums_x86_64=('f47a15449cd2a4b25dc768e4d9275d67c22acda6ebbc46270c38f5f135143f7551475168862b846a408f3858ee7edf725861a6bb3ce9ef2c783d1cab6d177511'
                    '3b8bb9453dfc8cad3b2a1c484d9acb6766c7900d6869e1696214216a0fab994e55409e4065267544a360283b2c824790f605d89749674ddb68dd58086f44f956')
@@ -31,6 +31,6 @@ sha512sums_aarch64=('87a39bb2e2e87390f6c6c38dbc4bdcced62d07af9128ddead7b0b46bc7b
                     '0ec5bd37b91a921bdeb26e92251f37d6c6adba4e2176973017b592e229c7512aa1765be4c4a87be44dfbb6bb30827b05f7e1551eff98ea006499317dec4a9e60')
 
 package() {
-	install -Dm 755 "$_pkgbin" "$pkgdir/usr/bin/$_pkgbin"
-	install -Dm 755 "$_pkgshim" "$pkgdir/usr/bin/$_pkgshim"
+	install -Dm 755 "$_pkgbin-$CARCH-$pkgver" "$pkgdir/usr/bin/$_pkgbin"
+	install -Dm 755 "$_pkgshim-$CARCH-$pkgver" "$pkgdir/usr/bin/$_pkgshim"
 }
diff --git a/plasma5-wallpapers-wallpaper-engine/.SRCINFO b/plasma5-wallpapers-wallpaper-engine/.SRCINFO
index 502e059..90e241f 100644
--- a/plasma5-wallpapers-wallpaper-engine/.SRCINFO
+++ b/plasma5-wallpapers-wallpaper-engine/.SRCINFO
@@ -16,8 +16,8 @@ pkgbase = plasma5-wallpapers-wallpaper-engine
 	depends = qt5-websockets
 	optdepends = qt5-webchannel: for web support
 	optdepends = mpv: alternative video backend
-	source = https://github.com/catsout/wallpaper-engine-kde-plugin/archive/v0.5.4.tar.gz
-	source = https://github.com/KhronosGroup/glslang/archive/11.10.0.tar.gz
+	source = https://github.com/catsout/wallpaper-engine-kde-plugin/archive/v0.5.4/wallpaper-engine-kde-plugin-0.5.4.tar.gz
+	source = https://github.com/KhronosGroup/glslang/archive/11.10.0/glslang-11.10.0.tar.gz
 	sha256sums = 83354734f7ea36e7077206506dd05f0e6877eb51294b820fdbdc398255c6f803
 	sha256sums = 8ffc19c435232d09299dd2c91e247292b3508c1b826a3497c60682e4bbf2d602
 
diff --git a/plasma5-wallpapers-wallpaper-engine/PKGBUILD b/plasma5-wallpapers-wallpaper-engine/PKGBUILD
index beb660a..940d069 100644
--- a/plasma5-wallpapers-wallpaper-engine/PKGBUILD
+++ b/plasma5-wallpapers-wallpaper-engine/PKGBUILD
@@ -13,10 +13,10 @@ depends=('gst-libav' 'python-websockets' 'plasma-framework' 'qt5-declarative' 'q
 makedepends=('extra-cmake-modules' 'qt5-webchannel' 'mpv' 'vulkan-headers')
 optdepends=('qt5-webchannel: for web support'
 	'mpv: alternative video backend')
-source=("https://github.com/catsout/${_pkgname}/archive/v${pkgver}.tar.gz"
-	"https://github.com/KhronosGroup/glslang/archive/${_pkgver_glslang}.tar.gz")
+source=("https://github.com/catsout/${_pkgname}/archive/v${pkgver}/${_pkgname}-${pkgver}.tar.gz"
+	"https://github.com/KhronosGroup/glslang/archive/${_pkgver_glslang}/glslang-${_pkgver_glslang}.tar.gz")
 sha256sums=('83354734f7ea36e7077206506dd05f0e6877eb51294b820fdbdc398255c6f803'
-	'8ffc19c435232d09299dd2c91e247292b3508c1b826a3497c60682e4bbf2d602')
+            '8ffc19c435232d09299dd2c91e247292b3508c1b826a3497c60682e4bbf2d602')
 
 prepare() {
 	mv -T "glslang-${_pkgver_glslang}" "${_pkgname}-${pkgver}/src/backend_scene/third_party/glslang"
diff --git a/prometheus-postgresql-exporter/.SRCINFO b/prometheus-postgresql-exporter/.SRCINFO
index 6217143..479e389 100644
--- a/prometheus-postgresql-exporter/.SRCINFO
+++ b/prometheus-postgresql-exporter/.SRCINFO
@@ -9,7 +9,7 @@ pkgbase = prometheus-postgresql-exporter
 	makedepends = go
 	makedepends = make
 	backup = etc/conf.d/prometheus-postgresql-exporter
-	source = https://github.com/prometheus-community/postgres_exporter/archive/v0.11.1.tar.gz
+	source = https://github.com/prometheus-community/postgres_exporter/archive/v0.11.1/postgres_exporter-0.11.1.tar.gz
 	source = prometheus-postgresql-exporter.service
 	source = prometheus-postgresql-exporter.conf
 	sha256sums = 48e38e5cc8f093f93a84b1536c2ae7dc480760f9c443ae654a9f1f83d289a7bc
diff --git a/prometheus-postgresql-exporter/PKGBUILD b/prometheus-postgresql-exporter/PKGBUILD
index aaf4248..d36f698 100644
--- a/prometheus-postgresql-exporter/PKGBUILD
+++ b/prometheus-postgresql-exporter/PKGBUILD
@@ -10,7 +10,7 @@ url="https://github.com/prometheus-community/postgres_exporter"
 license=('Apache')
 makedepends=('git' 'go' 'make')
 backup=('etc/conf.d/prometheus-postgresql-exporter')
-source=("https://github.com/prometheus-community/postgres_exporter/archive/v${pkgver}.tar.gz"
+source=("https://github.com/prometheus-community/postgres_exporter/archive/v${pkgver}/postgres_exporter-${pkgver}.tar.gz"
 	"prometheus-postgresql-exporter.service"
 	"prometheus-postgresql-exporter.conf")
 sha256sums=('48e38e5cc8f093f93a84b1536c2ae7dc480760f9c443ae654a9f1f83d289a7bc'
diff --git a/tuned/.SRCINFO b/tuned/.SRCINFO
index 93f411e..6761ce0 100644
--- a/tuned/.SRCINFO
+++ b/tuned/.SRCINFO
@@ -21,7 +21,7 @@ pkgbase = tuned
 	optdepends = virt-what: For use with virtual machines
 	optdepends = systemtap: Disk and net statistic monitoring systemtap scripts
 	backup = etc/tuned/active_profile
-	source = https://github.com/redhat-performance/tuned/archive/v2.19.0.tar.gz
+	source = https://github.com/redhat-performance/tuned/archive/v2.19.0/tuned-2.19.0.tar.gz
 	sha256sums = 3cb2aeb9ecebd66a1a1c3aaff9589f5c5402201d16f7caa01acf0b9374ed8724
 
 pkgname = tuned
diff --git a/tuned/PKGBUILD b/tuned/PKGBUILD
index e3085cb..dd318d6 100644
--- a/tuned/PKGBUILD
+++ b/tuned/PKGBUILD
@@ -15,7 +15,7 @@ optdepends=('virt-what: For use with virtual machines' 'systemtap: Disk and net
 makedepends=('desktop-file-utils')
 backup=('etc/tuned/active_profile')
 install="${pkgname}.install"
-source=("https://github.com/redhat-performance/${pkgname}/archive/v${pkgver}.tar.gz")
+source=("https://github.com/redhat-performance/${pkgname}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha256sums=('3cb2aeb9ecebd66a1a1c3aaff9589f5c5402201d16f7caa01acf0b9374ed8724')
 
 prepare() {