diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 2545406f..7610aa91 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -12,24 +12,18 @@ EMAIL_SUBJECT_PREPEND="[arm-auto]"
 
 SETS="
 	armv4tl_openrc
-	armv4tl_systemd
 	armv4tl_systemd_mu
 	armv5tel_openrc
-	armv5tel_systemd
 	armv5tel_systemd_mu
 	armv6j_hf_openrc
-	armv6j_hf_systemd
 	armv6j_hf_systemd_mu
 	armv6j_sf_openrc
-	armv6j_sf_systemd
 	armv6j_sf_systemd_mu
 	armv6j_hf_musl_openrc
 	armv6j_hf_musl_hardened_openrc
 	armv7a_hf_openrc
-	armv7a_hf_systemd
 	armv7a_hf_systemd_mu
 	armv7a_sf_openrc
-	armv7a_sf_systemd
 	armv7a_sf_systemd_mu
 	armv7a_hf_musl_openrc
 	armv7a_hf_musl_hardened_openrc
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 7abc8fdc..55eb174b 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -6,7 +6,15 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
 SPECS_DIR=${REPO_DIR}/releases/specs/arm64
 SUBARCH=arm64
 
-SETS="openrc llvm_openrc systemd systemd_mu llvm_systemd llvm_systemd_mu musl musl_hardened musl_llvm"
+SETS="
+	openrc
+	llvm_openrc
+	systemd_mu
+	llvm_systemd_mu
+	musl
+	musl_hardened
+	musl_llvm
+"
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
 SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 630e19e1..0f397fb2 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -5,7 +5,12 @@ UPLOAD_USER=hppa
 UPLOAD_KEY=/root/.ssh/id_ed25519
 SPECS_DIR=${REPO_DIR}/releases/specs/hppa
 
-SETS="hppa11_openrc hppa11_systemd hppa11_systemd_mu hppa20_openrc hppa20_systemd hppa20_systemd_mu"
+SETS="
+	hppa11_openrc
+	hppa11_systemd_mu 
+	hppa20_openrc 
+	hppa20_systemd_mu
+"
 
 SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
 SET_hppa11_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec netboot-hppa32.spec"
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index b18765e2..76dd80e1 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -7,7 +7,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/ia64
 
 SETS="
 	openrc
-	systemd
 	systemd_mu
 "