diff --git a/releases/specs/amd64/stage1-x32.spec b/releases/specs/amd64/x32/stage1-openrc.spec
similarity index 76%
rename from releases/specs/amd64/stage1-x32.spec
rename to releases/specs/amd64/x32/stage1-openrc.spec
index fbb31dd4..40f29cbb 100644
--- a/releases/specs/amd64/stage1-x32.spec
+++ b/releases/specs/amd64/x32/stage1-openrc.spec
@@ -1,10 +1,10 @@
 subarch: x32
 target: stage1
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/amd64/17.0/x32
 snapshot: @TIMESTAMP@
-source_subpath: default/stage3-x32-latest
+source_subpath: default/stage3-x32-openrc-latest
 compression_mode: pixz_x
 update_seed: yes
 update_seed_command: --update --deep --newuse @world
diff --git a/releases/specs/amd64/stage2-x32.spec b/releases/specs/amd64/x32/stage2-openrc.spec
similarity index 70%
rename from releases/specs/amd64/stage2-x32.spec
rename to releases/specs/amd64/x32/stage2-openrc.spec
index 0751ba26..444009cc 100644
--- a/releases/specs/amd64/stage2-x32.spec
+++ b/releases/specs/amd64/x32/stage2-openrc.spec
@@ -1,10 +1,10 @@
 subarch: x32
 target: stage2
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/amd64/17.0/x32
 snapshot: @TIMESTAMP@
-source_subpath: default/stage1-x32-@TIMESTAMP@
+source_subpath: default/stage1-x32-openrc-@TIMESTAMP@
 compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng
diff --git a/releases/specs/amd64/stage3-x32.spec b/releases/specs/amd64/x32/stage3-openrc.spec
similarity index 70%
rename from releases/specs/amd64/stage3-x32.spec
rename to releases/specs/amd64/x32/stage3-openrc.spec
index 7b5e7215..5bc464b4 100644
--- a/releases/specs/amd64/stage3-x32.spec
+++ b/releases/specs/amd64/x32/stage3-openrc.spec
@@ -1,10 +1,10 @@
 subarch: x32
 target: stage3
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/amd64/17.0/x32
 snapshot: @TIMESTAMP@
-source_subpath: default/stage2-x32-@TIMESTAMP@
+source_subpath: default/stage2-x32-openrc-@TIMESTAMP@
 compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng
diff --git a/tools/catalyst-auto-amd64-demeter.conf b/tools/catalyst-auto-amd64-demeter.conf
index 0ce857ec..8f462ad9 100644
--- a/tools/catalyst-auto-amd64-demeter.conf
+++ b/tools/catalyst-auto-amd64-demeter.conf
@@ -11,12 +11,15 @@ TYPE="auto"
 SPECS_DIR=${REPO_DIR}/releases/specs/amd64
 
 SETS="
-	vanilla
-	hardened
+	musl
+	musl_hardened
+	x32_openrc
 "
 
-SET_vanilla_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec"
-SET_hardened_SPECS="musl/stage1-hardened.spec musl/stage2-hardened.spec musl/stage3-hardened.spec"
+SET_musl_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec"
+SET_musl_hardened_SPECS="musl/stage1-hardened.spec musl/stage2-hardened.spec musl/stage3-hardened.spec"
+
+SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage2-openrc.spec x32/stage3-openrc.spec"
 
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
 
@@ -24,7 +27,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
 
 update_symlinks() {
 	# Symlink the latest stages3 to build from
-	for d in ${BUILD_SRCDIR_BASE}/builds/{musl,musl-hardened} ; do
+	for d in ${BUILD_SRCDIR_BASE}/builds/{default,musl,musl-hardened} ; do
 		pushd "${d}" >/dev/null || exit
 		shopt -s extglob
 		for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
@@ -47,8 +50,17 @@ update_symlinks() {
 post_build() {
 	local set=$1 spec=$2
 
+	pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
+	UPLOAD_DEST=${BUILD_DESTDIR_BASE}/x32
+	case ${spec} in
+	x32/stage3-openrc.spec)
+		upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
+		;;
+	esac
+	popd >/dev/null || exit
+
 	pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit
-	UPLOAD_DEST=${BUILD_DESTDIR_BASE}
+	UPLOAD_DEST=${BUILD_DESTDIR_BASE}/musl
 	case ${spec} in
 	musl/stage3.spec)
 		upload stage3-amd64-musl-${TIMESTAMP}.tar.xz*
@@ -57,7 +69,7 @@ post_build() {
 	popd >/dev/null || exit
 
 	pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit
-	UPLOAD_DEST=${BUILD_DESTDIR_BASE}
+	UPLOAD_DEST=${BUILD_DESTDIR_BASE}/musl
 	case ${spec} in
 	musl/stage3-hardened.spec)
 		upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz*
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 2f6ed30e..a6f1866c 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -14,7 +14,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
 SETS="
 	multilib minimal_multilib
 	nomultilib minimal_nomultilib
-	x32
 	systemd
 	hardened_multilib minimal_hardened_multilib
 	hardened_nomultilib minimal_hardened_nomultilib
@@ -29,8 +28,6 @@ SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomul
 
 SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
 
-SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
-
 SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
 SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
 #SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec"