diff --git a/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec b/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec
index 18643b3e..89ed0a02 100644
--- a/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec
@@ -3,10 +3,10 @@ target: stage1
 version_stamp: systemd-mergedusr-@TIMESTAMP@
 cflags: -O2 -pipe
 interpreter: /usr/bin/qemu-riscv64
-rel_type: default
+rel_type: mergedusr
 profile: default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr
 snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_lp64-systemd-mergedusr-latest
+source_subpath: mergedusr/stage3-rv64_lp64-systemd-mergedusr-latest
 compression_mode: pixz
 decompressor_search_order: xz bzip2
 update_seed: no
diff --git a/releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec b/releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec
index e67bf0a5..6d3a325f 100644
--- a/releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec
@@ -3,10 +3,10 @@ target: stage1
 version_stamp: systemd-mergedusr-@TIMESTAMP@
 cflags: -O2 -pipe
 interpreter: /usr/bin/qemu-riscv64
-rel_type: default
+rel_type: mergedusr
 profile: default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr
 snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_lp64d-systemd-mergedusr-latest
+source_subpath: mergedusr/stage3-rv64_lp64d-systemd-mergedusr-latest
 compression_mode: pixz
 decompressor_search_order: xz bzip2
 update_seed: no
diff --git a/releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec b/releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec
index 98d262ce..ee937b35 100644
--- a/releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec
@@ -3,10 +3,10 @@ target: stage1
 version_stamp: systemd-mergedusr-@TIMESTAMP@
 cflags: -O2 -pipe
 interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
-rel_type: default
+rel_type: mergedusr
 profile: default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr
 snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_multilib-systemd-mergedusr-latest
+source_subpath: mergedusr/stage3-rv64_multilib-systemd-mergedusr-latest
 compression_mode: pixz
 decompressor_search_order: xz bzip2
 update_seed: no
diff --git a/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec
index f171832f..2e10e0fd 100644
--- a/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec
@@ -3,10 +3,10 @@ target: stage3
 version_stamp: systemd-mergedusr-@TIMESTAMP@
 cflags: -O2 -pipe
 interpreter: /usr/bin/qemu-riscv64
-rel_type: default
+rel_type: mergedusr
 profile: default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr
 snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64-systemd-mergedusr-@TIMESTAMP@
+source_subpath: mergedusr/stage1-rv64_lp64-systemd-mergedusr-@TIMESTAMP@
 compression_mode: pixz
 decompressor_search_order: xz bzip2
 portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec
index 5be7e53b..f1c823cb 100644
--- a/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec
@@ -3,10 +3,10 @@ target: stage3
 version_stamp: systemd-mergedusr-@TIMESTAMP@
 cflags: -O2 -pipe
 interpreter: /usr/bin/qemu-riscv64
-rel_type: default
+rel_type: mergedusr
 profile: default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr
 snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64d-systemd-mergedusr-@TIMESTAMP@
+source_subpath: mergedusr/stage1-rv64_lp64d-systemd-mergedusr-@TIMESTAMP@
 compression_mode: pixz
 decompressor_search_order: xz bzip2
 portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
diff --git a/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec
index 4b784d51..82412203 100644
--- a/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec
@@ -3,10 +3,10 @@ target: stage3
 version_stamp: systemd-mergedusr-@TIMESTAMP@
 cflags: -O2 -pipe
 interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
-rel_type: default
+rel_type: mergedusr
 profile: default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr
 snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_multilib-systemd-mergedusr-@TIMESTAMP@
+source_subpath: mergedusr/stage1-rv64_multilib-systemd-mergedusr-@TIMESTAMP@
 compression_mode: pixz
 decompressor_search_order: xz bzip2
 portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 9c492491..04a1a89e 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -41,7 +41,7 @@ SET_multilib_systemd_mu_SPECS="stage1-multilib-systemd-mu.spec stage3-multilib-s
 update_symlinks() {
 	# Symlink the latest stages3 to build from
 	local d f
-	for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" ; do
+	for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" "${BUILD_SRCDIR_BASE}/builds/musl" ; do
 		mkdir -p "${d}"
 		pushd "${d}" >/dev/null
 		for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
@@ -66,6 +66,11 @@ post_build() {
 			upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g' -e 's:-mu:-mergedusr:g')-${TIMESTAMP}*.xz*
 			popd >/dev/null
 			;;
+		stage3*systemd-mu.spec)
+			pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
+			upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g' -e 's:-mu:-mergedusr:g')-${TIMESTAMP}*.xz*
+			popd >/dev/null
+			;;
 		stage3*musl.spec)
 			pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
 			upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:-:_:g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*