diff --git a/releases/specs-qemu/riscv/stage1-lp64d-musl.spec b/releases/specs-qemu/riscv/stage1-lp64d-musl.spec
index 4ea63d61..1a42ff07 100644
--- a/releases/specs-qemu/riscv/stage1-lp64d-musl.spec
+++ b/releases/specs-qemu/riscv/stage1-lp64d-musl.spec
@@ -1,12 +1,11 @@
-subarch: rv64_lp64d
+subarch: rv64_lp64d_musl
 target: stage1
-chost: riscv64-gentoo-linux-musl
-version_stamp: musl-@TIMESTAMP@
+version_stamp: @TIMESTAMP@
 interpreter: /usr/bin/qemu-riscv64
 rel_type: musl
 profile: default/linux/riscv/20.0/rv64gc/lp64d/musl
 snapshot: @TIMESTAMP@
-source_subpath: musl/stage3-rv64_lp64d-musl-latest
+source_subpath: musl/stage3-rv64_lp64d_musl-latest
 compression_mode: pixz
 decompressor_search_order: xz bzip2
 update_seed: yes
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-musl.spec b/releases/specs-qemu/riscv/stage3-lp64d-musl.spec
index b66506b6..ffe0c1de 100644
--- a/releases/specs-qemu/riscv/stage3-lp64d-musl.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64d-musl.spec
@@ -1,11 +1,11 @@
-subarch: rv64_lp64d
+subarch: rv64_lp64d_musl
 target: stage3
-version_stamp: musl-@TIMESTAMP@
+version_stamp: @TIMESTAMP@
 interpreter: /usr/bin/qemu-riscv64
 rel_type: musl
 profile: default/linux/riscv/20.0/rv64gc/lp64d/musl
 snapshot: @TIMESTAMP@
-source_subpath: musl/stage1-rv64_lp64d-musl-@TIMESTAMP@
+source_subpath: musl/stage1-rv64_lp64d_musl-@TIMESTAMP@
 compression_mode: pixz
 decompressor_search_order: xz bzip2
 portage_confdir: @REPO_DIR@/releases/portage/stages-qemu