diff --git a/releases/specs/s390/s390x/stage1-openrc-23.spec b/releases/specs/s390/s390x/stage1-openrc-23.spec
new file mode 100644
index 00000000..241d38b8
--- /dev/null
+++ b/releases/specs/s390/s390x/stage1-openrc-23.spec
@@ -0,0 +1,11 @@
+subarch: s390x
+version_stamp: openrc-@TIMESTAMP@
+target: stage1
+rel_type: 23.0-default
+profile: default/linux/s390/23.0/s390x
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage3-s390x-openrc-latest
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
diff --git a/releases/specs/s390/s390x/stage1-systemd-23.spec b/releases/specs/s390/s390x/stage1-systemd-23.spec
new file mode 100644
index 00000000..82204159
--- /dev/null
+++ b/releases/specs/s390/s390x/stage1-systemd-23.spec
@@ -0,0 +1,11 @@
+subarch: s390x
+version_stamp: systemd-@TIMESTAMP@
+target: stage1
+rel_type: 23.0-default
+profile: default/linux/s390/23.0/s390x/systemd
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage3-s390x-systemd-latest
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
diff --git a/releases/specs/s390/s390x/stage3-openrc-23.spec b/releases/specs/s390/s390x/stage3-openrc-23.spec
new file mode 100644
index 00000000..9cc3370e
--- /dev/null
+++ b/releases/specs/s390/s390x/stage3-openrc-23.spec
@@ -0,0 +1,10 @@
+subarch: s390x
+version_stamp: openrc-@TIMESTAMP@
+target: stage3
+rel_type: 23.0-default
+profile: default/linux/s390/23.0/s390x
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage1-s390x-openrc-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+binrepo_path: s390/binpackages/23.0/s390x
diff --git a/releases/specs/s390/s390x/stage3-systemd-23.spec b/releases/specs/s390/s390x/stage3-systemd-23.spec
new file mode 100644
index 00000000..4c24ff88
--- /dev/null
+++ b/releases/specs/s390/s390x/stage3-systemd-23.spec
@@ -0,0 +1,10 @@
+subarch: s390x
+version_stamp: systemd-@TIMESTAMP@
+target: stage3
+rel_type: 23.0-default
+profile: default/linux/s390/23.0/s390x/systemd
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage1-s390x-systemd-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+binrepo_path: s390/binpackages/23.0/s390x
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index f4fe9d83..8627b6fa 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -6,15 +6,25 @@ UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
 SUBARCH=s390x
 
-SETS="openrc systemd_mu"
+SETS="
+	openrc
+	systemd_mu
+	openrc_23
+	systemd_23
+"
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
 SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
 
 SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
 
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
 
+
 update_symlinks() {
 	# Symlink the latest stages3 to build from
 	local d f
@@ -47,6 +57,14 @@ post_build() {
 	esac
 	popd >/dev/null
 
+	pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+	case ${spec} in
+	stage3-systemd-23.spec)
+		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390x" s390/23.0/s390x
+		;;
+	esac
+	popd >/dev/null
+
 	pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
 	case ${spec} in
 	stage3-systemd-mu.spec)