diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 878236f7..3d1c6f79 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -15,7 +15,7 @@ EMAIL_SUBJECT_PREPEND="[sparc-auto]"
 update_symlinks() {
 	# Symlink the latest stages3 to build from
 	local d f
-	for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+	for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
 		mkdir -p "${d}"
 		pushd "${d}" >/dev/null
 		for f in $(ls stage3-sparc-*xz | grep -v latest | give_latest_from_dates) ; do
@@ -40,16 +40,10 @@ post_build() {
 		;;
 	sparc/stage3.spec)
 		upload stage3-sparc-${TIMESTAMP}*.xz*
-		;;
-	sparc/systemd-stage3.spec)
-		upload stage3-sparc-systemd-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc" sparc/17.0/32
 		;;
 	sparc64/stage3.spec)
 		upload stage3-sparc64-${TIMESTAMP}*.xz*
-		;;
-	sparc64/systemd-stage3.spec)
-		upload stage3-sparc64-systemd-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc64" sparc/17.0/64
 		;;
 	esac