diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 8aa1e38c..75356aa0 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -13,9 +13,7 @@ SETS="
 	musl_hardened_23
 	musl_hardened_power9le_23
 	openrc
-	systemd_mu
 	openrc_power9le
-	systemd_power9le_mu
 	musl_hardened
 	musl_hardened_power9le
 "
@@ -23,12 +21,8 @@ SETS="
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
 SET_openrc_OPTIONAL_SPECS=" installcd-stage1.spec installcd-stage2-minimal.spec"
 
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
 SET_openrc_power9le_SPECS="stage1-openrc-power9le.spec stage3-openrc-power9le.spec stage3d-openrc-power9le.spec"
 
-SET_systemd_power9le_mu_SPECS="stage1-systemd-mu-power9le.spec stage3-systemd-mu-power9le.spec stage3d-systemd-mu-power9le.spec"
-
 SET_musl_hardened_SPECS="stage1-musl-hardened-openrc.spec stage3-musl-hardened-openrc.spec"
 
 SET_musl_hardened_power9le_SPECS="stage1-musl-hardened-openrc-power9le.spec stage3-musl-hardened-openrc-power9le.spec"
@@ -77,43 +71,40 @@ post_build() {
 		upload default/*${TIMESTAMP}*.iso*
 		;;
 	stage3-openrc.spec)
-		upload default/stage3-ppc64le-openrc-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64le" ppc/17.0/ppc64le
 		;;
-	stage3-systemd-mu.spec)
-		upload mergedusr/stage3-ppc64le-systemd-mergedusr-${TIMESTAMP}*.xz*
-		;;
 	stage3-openrc-power9le.spec)
-		upload power9le/stage3-power9le-openrc-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/power9le/stage3-power9le" ppc/17.0/power9le
 		;;
-	stage3d-openrc-power9le.spec)
-		upload power9le/stage3-power9le-desktop-openrc-${TIMESTAMP}*.xz*
-		;;
-	stage3-systemd-mu-power9le.spec)
-		upload power9le-mergedusr/stage3-power9le-systemd-mergedusr-${TIMESTAMP}*.xz*
-		;;
-	stage3d-systemd-mu-power9le.spec)
-		upload power9le-mergedusr/stage3-power9le-desktop-systemd-mergedusr-${TIMESTAMP}*.xz*
-		;;
 	stage3-musl-hardened-openrc.spec)
-		upload musl-hardened/stage3-ppc64le-musl-hardened-openrc-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64le" ppc/17.0/ppc64le_musl_hardened
 		;;
 	stage3-musl-hardened-openrc-power9le.spec)
-		upload power9le-musl-hardened/stage3-power9le-musl-hardened-openrc-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/power9le-musl-hardened/stage3-power9le" ppc/17.0/power9le_musl_hardened
 		;;
+	stage3-openrc-23.spec)
+		upload 23.0-default/stage3-ppc64le-openrc-${TIMESTAMP}*.xz*
+		;;
 	stage3-systemd-23.spec)
+		upload 23.0-default/stage3-ppc64le-systemd-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc64le" ppc/23.0/ppc64le
 		;;
+	stage3-openrc-power9le-23.spec)
+		upload 23.0-default/stage3-power9le-openrc-${TIMESTAMP}*.xz*
+		;;
+	stage3d-openrc-power9le-23.spec)
+		upload 23.0-default/stage3-power9le-desktop-openrc-${TIMESTAMP}*.xz*
+		;;
 	stage3-systemd-power9le-23.spec)
+		upload 23.0-default/stage3-power9le-systemd-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-power9le" ppc/23.0/power9le
 		;;
 	stage3-musl-hardened-openrc-23.spec)
+		upload 23.0-musl-hardened/stage3-ppc64le-musl-hardened-openrc-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc64le" ppc/23.0/ppc64le_musl_hardened
 		;;
 	stage3-musl-hardened-openrc-power9le-23.spec)
+		upload 23.0-musl-hardened/stage3-power9le-musl-hardened-openrc-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-power9le" ppc/23.0/power9le_musl_hardened
 		;;
 	*)