diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 5ad68a57..ad73c416 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -26,8 +26,22 @@ SETS="
 	musl_llvm
 	x32_openrc
 	x32_systemd_mu
+	openrc_23
+	systemd_23
+	nomultilib_openrc_23
+	nomultilib_systemd_23
+	llvm_openrc_23
+	llvm_systemd_23
+	hardened_openrc_23
+	hardened_systemd_23
+	hardened_selinux_openrc_23
+	hardened_selinux_systemd_23
+	x32_openrc_23
+	x32_systemd_23
 "
 
+# 17.0
+
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
 SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-stage2-minimal.spec"
 
@@ -63,6 +77,35 @@ SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
 
 SET_x32_systemd_mu_SPECS="x32/stage1-systemd-mu.spec x32/stage3-systemd-mu.spec"
 
+# 23.0
+
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_openrc_23_OPTIONAL_SPECS="stage3d-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+SET_systemd_23_OPTIONAL_SPECS="stage3d-systemd-23.spec"
+
+SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec hardened/stage3-openrc-23.spec"
+
+SET_hardened_systemd_23_SPECS="hardened/stage1-systemd-23.spec hardened/stage3-systemd-23.spec"
+
+SET_hardened_selinux_openrc_23_SPECS="hardened-selinux/stage1-openrc-23.spec hardened-selinux/stage3-openrc-23.spec"
+
+SET_hardened_selinux_systemd_23_SPECS="hardened-selinux/stage1-systemd-23.spec hardened-selinux/stage3-systemd-23.spec"
+
+SET_nomultilib_openrc_23_SPECS="nomultilib/stage1-openrc-23.spec nomultilib/stage3-openrc-23.spec"
+
+SET_nomultilib_systemd_23_SPECS="nomultilib/stage1-systemd-23.spec nomultilib/stage3-systemd-23.spec"
+
+SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec llvm/stage3-openrc-23.spec"
+
+SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec llvm/stage3-systemd-23.spec"
+
+SET_x32_openrc_23_SPECS="x32/stage1-openrc-23.spec x32/stage3-openrc-23.spec"
+
+SET_x32_systemd_23_SPECS="x32/stage1-systemd-23.spec x32/stage3-systemd-23.spec"
+
+
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
 
 EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
@@ -119,6 +162,14 @@ post_build() {
 	esac
 	popd >/dev/null || exit
 
+	pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-default >/dev/null || exit
+	case ${spec} in
+	x32/stage3-openrc-23.spec)
+		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-x32" amd64/23.0/x32
+		;;
+	esac
+	popd >/dev/null || exit
+
 	pushd "${BUILD_SRCDIR_BASE}"/builds/mergedusr >/dev/null || exit
 	case ${spec} in
 	stage3-systemd-mu.spec)
@@ -145,6 +196,14 @@ post_build() {
 	esac
 	popd >/dev/null || exit
 
+	pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-llvm >/dev/null || exit
+	case ${spec} in
+	llvm/stage3-systemd-23.spec)
+		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-llvm/stage3-amd64" amd64/23.0/x86-64_llvm
+		;;
+	esac
+	popd >/dev/null || exit
+
 	pushd "${BUILD_SRCDIR_BASE}"/builds/llvm-mergedusr >/dev/null || exit
 	case ${spec} in
 	clang/stage3-systemd-mu.spec)
@@ -174,6 +233,14 @@ post_build() {
 	esac
 	popd >/dev/null || exit
 
+	pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-hardened >/dev/null || exit
+	case ${spec} in
+	hardened/stage3-systemd-23.spec)
+		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-amd64" amd64/23.0/x86-64_hardened
+		;;
+	esac
+	popd >/dev/null || exit
+
 	pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit
 	case ${spec} in
 	musl/stage3.spec)