diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 3bc474b9..355c7d82 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -3,21 +3,21 @@
 
 UPLOAD_USER=s390
 UPLOAD_KEY=/root/.ssh/id_rsa
-SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
+SPECS_DIR=${REPO_DIR}/releases/specs/s390
 SUBARCH=s390x
 
 SETS="
-	openrc_23
-	systemd_23
-	openrc
+	openrc_64_23
+	systemd_64_23
+	openrc_64
 "
 
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
+SET_openrc_64_SPECS="s390x/stage1-openrc.spec s390x/stage3-openrc.spec"
+SET_openrc_64_OPTIONAL_SPECS="s390x/netboot/netboot.spec"
 
-SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_openrc_64_23_SPECS="s390x/stage1-openrc-23.spec s390x/stage3-openrc-23.spec"
 
-SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+SET_systemd_64_23_SPECS="s390x/stage1-systemd-23.spec s390x/stage3-systemd-23.spec"
 
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
 
@@ -41,13 +41,13 @@ post_build() {
 
 	pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
 	case ${spec} in
-	netboot/netboot.spec)
+	s390x/netboot/netboot.spec)
 		ls -l netboot-s390x-${TIMESTAMP}/
 		mv -v netboot-s390x-${TIMESTAMP}/kernels/netboot64 netboot-s390x-${TIMESTAMP}/netboot-s390x-kernel-${TIMESTAMP}
 		mv -v netboot-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz netboot-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
 		upload netboot-s390x-${TIMESTAMP}/netboot*
 		;;
-	stage3-openrc.spec)
+	s390x/stage3-openrc.spec)
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390x" s390/17.0/s390x
 		;;
 	esac
@@ -55,11 +55,11 @@ post_build() {
 
 	pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
 	case ${spec} in
-	stage3-openrc-23.spec)
-		upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
+	s390x/stage3-openrc-23.spec)
+		upload stage3-s390x-openrc-${TIMESTAMP}.tar.xz*
 		;;
-	stage3-systemd-23.spec)
-		upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
+	s390x/stage3-systemd-23.spec)
+		upload stage3-s390x-systemd-${TIMESTAMP}.tar.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390x" s390/23.0/s390x
 		;;
 	esac