diff --git a/releases/specs-qemu/riscv/stage1-lp64-musl.spec b/releases/specs-qemu/riscv/stage1-lp64-musl.spec
deleted file mode 100644
index ab62a066..00000000
--- a/releases/specs-qemu/riscv/stage1-lp64-musl.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: rv64_lp64_musl
-target: stage1
-version_stamp: @TIMESTAMP@
-interpreter: /usr/bin/qemu-riscv64
-rel_type: musl
-profile: default/linux/riscv/20.0/rv64gc/lp64/musl
-snapshot_treeish: @TREEISH@
-source_subpath: musl/stage3-rv64_lp64_musl-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/riscv/stage1-lp64-openrc.spec b/releases/specs-qemu/riscv/stage1-lp64-openrc.spec
deleted file mode 100644
index 76ffe460..00000000
--- a/releases/specs-qemu/riscv/stage1-lp64-openrc.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-subarch: rv64_lp64
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/20.0/rv64gc/lp64
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-rv64_lp64-openrc-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/riscv/stage1-lp64d-musl.spec b/releases/specs-qemu/riscv/stage1-lp64d-musl.spec
deleted file mode 100644
index e8bef600..00000000
--- a/releases/specs-qemu/riscv/stage1-lp64d-musl.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: rv64_lp64d_musl
-target: stage1
-version_stamp: @TIMESTAMP@
-interpreter: /usr/bin/qemu-riscv64
-rel_type: musl
-profile: default/linux/riscv/20.0/rv64gc/lp64d/musl
-snapshot_treeish: @TREEISH@
-source_subpath: musl/stage3-rv64_lp64d_musl-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/riscv/stage1-lp64d-openrc.spec b/releases/specs-qemu/riscv/stage1-lp64d-openrc.spec
deleted file mode 100644
index 179ae920..00000000
--- a/releases/specs-qemu/riscv/stage1-lp64d-openrc.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-subarch: rv64_lp64d
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/20.0/rv64gc/lp64d
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-rv64_lp64d-openrc-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/riscv/stage1-multilib-openrc.spec b/releases/specs-qemu/riscv/stage1-multilib-openrc.spec
deleted file mode 100644
index 089ecaf6..00000000
--- a/releases/specs-qemu/riscv/stage1-multilib-openrc.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-subarch: rv64_multilib
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
-rel_type: default
-profile: default/linux/riscv/20.0/rv64gc/multilib
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-rv64_multilib-openrc-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/riscv/stage3-lp64-musl.spec b/releases/specs-qemu/riscv/stage3-lp64-musl.spec
deleted file mode 100644
index 6cc85dbd..00000000
--- a/releases/specs-qemu/riscv/stage3-lp64-musl.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64_musl
-target: stage3
-version_stamp: @TIMESTAMP@
-interpreter: /usr/bin/qemu-riscv64
-rel_type: musl
-profile: default/linux/riscv/20.0/rv64gc/lp64/musl
-snapshot_treeish: @TREEISH@
-source_subpath: musl/stage1-rv64_lp64_musl-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: riscv/binpackages/20.0/rv64_lp64_musl
diff --git a/releases/specs-qemu/riscv/stage3-lp64-openrc.spec b/releases/specs-qemu/riscv/stage3-lp64-openrc.spec
deleted file mode 100644
index 1981b109..00000000
--- a/releases/specs-qemu/riscv/stage3-lp64-openrc.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: rv64_lp64
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/20.0/rv64gc/lp64
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-rv64_lp64-openrc-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: riscv/binpackages/20.0/rv64_lp64
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-musl.spec b/releases/specs-qemu/riscv/stage3-lp64d-musl.spec
deleted file mode 100644
index 875421f3..00000000
--- a/releases/specs-qemu/riscv/stage3-lp64d-musl.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64d_musl
-target: stage3
-version_stamp: @TIMESTAMP@
-interpreter: /usr/bin/qemu-riscv64
-rel_type: musl
-profile: default/linux/riscv/20.0/rv64gc/lp64d/musl
-snapshot_treeish: @TREEISH@
-source_subpath: musl/stage1-rv64_lp64d_musl-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: riscv/binpackages/20.0/rv64_lp64d_musl
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-openrc.spec b/releases/specs-qemu/riscv/stage3-lp64d-openrc.spec
deleted file mode 100644
index c383a523..00000000
--- a/releases/specs-qemu/riscv/stage3-lp64d-openrc.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: rv64_lp64d
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/20.0/rv64gc/lp64d
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-rv64_lp64d-openrc-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: riscv/binpackages/20.0/rv64_lp64d
diff --git a/releases/specs-qemu/riscv/stage3-multilib-openrc.spec b/releases/specs-qemu/riscv/stage3-multilib-openrc.spec
deleted file mode 100644
index f0ab9b0d..00000000
--- a/releases/specs-qemu/riscv/stage3-multilib-openrc.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: rv64_multilib
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
-rel_type: default
-profile: default/linux/riscv/20.0/rv64gc/multilib
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-rv64_multilib-openrc-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: riscv/binpackages/20.0/rv64_multilib