diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 4b5c5a43..1e1556e8 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -13,24 +13,18 @@ SETS="
 	systemd_64_23
 	musl_hardened_64_23
 	openrc
-	systemd_mu
 	musl_hardened
 	openrc_64
-	systemd_mu_64
 	musl_hardened_64
 "
  
 SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec"
 SET_openrc_OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
 
-SET_systemd_mu_SPECS="ppc32/stage1-systemd-mu.spec ppc32/stage3-systemd-mu.spec"
-
 SET_musl_hardened_SPECS="ppc32/stage1-musl-hardened-openrc.spec ppc32/stage3-musl-hardened-openrc.spec"
 
 SET_openrc_64_SPECS="ppc64/stage1-openrc.spec ppc64/stage3-openrc.spec"
 
-SET_systemd_mu_64_SPECS="ppc64/stage1-systemd-mu.spec ppc64/stage3-systemd-mu.spec"
-
 SET_musl_hardened_64_SPECS="ppc64/stage1-musl-hardened-openrc.spec ppc64/stage3-musl-hardened-openrc.spec"
 
 SET_openrc_23_SPECS="ppc32/stage1-openrc-23.spec ppc32/stage3-openrc-23.spec"
@@ -78,37 +72,38 @@ post_build() {
 		upload default/*${TIMESTAMP}*.iso*
 		;;
 	ppc32/stage3-openrc.spec)
-		upload default/stage3-ppc-openrc-*${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc" ppc/17.0/ppc
 		;;
-	ppc32/stage3-systemd-mu.spec)
-		upload mergedusr/stage3-ppc-systemd-mergedusr-*${TIMESTAMP}*.xz*
-		;;
 	ppc32/stage3-musl-hardened-openrc.spec)
-		upload musl-hardened/stage3-ppc-musl-hardened-openrc-*${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc" ppc/17.0/ppc_musl_hardened
 		;;
 	ppc64/stage3-openrc.spec)
-		upload default/stage3-ppc64-openrc-*${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64" ppc/17.0/ppc64
 		;;
-	ppc64/stage3-systemd-mu.spec)
-		upload mergedusr/stage3-ppc64-systemd-mergedusr-*${TIMESTAMP}*.xz*
-		;;
 	ppc64/stage3-musl-hardened-openrc.spec)
-		upload musl-hardened/stage3-ppc64-musl-hardened-openrc-*${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64" ppc/17.0/ppc64_musl_hardened
 		;;
+
+	ppc32/stage3-openrc-23.spec)
+		upload 23.0-default/stage3-ppc-openrc-*${TIMESTAMP}*.xz*
+		;;
 	ppc32/stage3-systemd-23.spec)
+		upload 23.0-default/stage3-ppc-systemd-*${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc" ppc/23.0/ppc
 		;;
 	ppc32/stage3-musl-hardened-openrc-23.spec)
+		upload 23.0-musl-hardened/stage3-ppc-musl-hardened-openrc-*${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc" ppc/23.0/ppc_musl_hardened
 		;;
+	ppc64/stage3-openrc-23.spec)
+		upload 23.0-default/stage3-ppc64-openrc-*${TIMESTAMP}*.xz*
+		;;
 	ppc64/stage3-systemd-23.spec)
+		upload 23.0-default/stage3-ppc64-systemd-*${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc64" ppc/23.0/ppc64
 		;;
 	ppc64/stage3-musl-hardened-openrc-23.spec)
+		upload 23.0-musl-hardened/stage3-ppc64-musl-hardened-openrc-*${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc64" ppc/23.0/ppc64_musl_hardened
 		;;
 	*)