diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index b5cf1b7c..4fbce5bf 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -137,6 +137,7 @@ post_build() {
 		;;
 	x32/stage3-systemd.spec)
 		upload stage3-x32-systemd-${TIMESTAMP}.tar.xz*
+		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-x32" amd64/17.0/x32
 		;;
 	livegui/livegui-stage2.spec)
 		upload livegui-amd64-${TIMESTAMP}.iso*
@@ -168,7 +169,7 @@ post_build() {
 		;;
 	clang/stage3-systemd.spec)
 		upload stage3-amd64-llvm-systemd-${TIMESTAMP}.tar.xz*
-		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/clang/stage3-amd64" amd64/17.1/amd64_llvm
+		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/clang/stage3-amd64" amd64/17.1/x86-64_llvm
 		;;
 	esac
 	popd >/dev/null || exit
@@ -185,6 +186,7 @@ post_build() {
 	case ${spec} in
 	hardened/stage3-openrc.spec)
 		upload stage3-amd64-hardened-openrc-${TIMESTAMP}.tar.xz*
+		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/hardened/stage3-amd64" amd64/17.1/x86-64_hardened
 		;;
 	hardened/admincd-stage2.spec)
 		upload admincd-amd64-${TIMESTAMP}.iso*
@@ -205,6 +207,7 @@ post_build() {
 	case ${spec} in
 	musl/stage3.spec)
 		upload stage3-amd64-musl-${TIMESTAMP}.tar.xz*
+		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-amd64" amd64/17.1/x86-64_musl
 		;;
 	esac
 	popd >/dev/null || exit
@@ -213,6 +216,7 @@ post_build() {
 	case ${spec} in
 	musl-clang/stage3.spec)
 		upload stage3-amd64-musl-llvm-${TIMESTAMP}.tar.xz*
+		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-clang/stage3-amd64" amd64/17.1/x86-64_musl_llvm
 		;;
 	esac
 	popd >/dev/null || exit
@@ -221,6 +225,7 @@ post_build() {
 	case ${spec} in
 	musl-hardened/stage3.spec)
 		upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz*
+		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-amd64" amd64/17.1/x86-64_musl_hardened
 		;;
 	esac
 	popd >/dev/null || exit
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 6872b152..0f3c3562 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -73,6 +73,8 @@ post_build() {
 		stage3*musl.spec)
 			pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
 			upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:-:_:g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
+			upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-rv64_lp64d_musl" riscv/20.0/rv64_lp64d_musl
+			upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-rv64_lp64_musl" riscv/20.0/rv64_lp64_musl
 			popd >/dev/null
 			;;
 		*)