diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 76dd80e1..47c24f74 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -13,8 +13,6 @@ SETS="
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
 SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-
 SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
 
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
@@ -22,7 +20,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
 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*xz | grep -v latest | give_latest_from_dates) ; do
@@ -43,9 +41,6 @@ post_build() {
 		;;
 	stage3-openrc.spec)
 		upload stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
-		;;
-	stage3-systemd.spec)
-		upload stage3-ia64-systemd-${TIMESTAMP}.tar.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ia64" ia64/17.0/ia64
 		;;
 	esac