diff --git a/releases/specs/riscv/stage1-ilp32.spec b/releases/specs-qemu/riscv/stage1-ilp32.spec
similarity index 100%
rename from releases/specs/riscv/stage1-ilp32.spec
rename to releases/specs-qemu/riscv/stage1-ilp32.spec
diff --git a/releases/specs/riscv/stage1-lp64-systemd.spec b/releases/specs-qemu/riscv/stage1-lp64-systemd.spec
similarity index 100%
rename from releases/specs/riscv/stage1-lp64-systemd.spec
rename to releases/specs-qemu/riscv/stage1-lp64-systemd.spec
diff --git a/releases/specs/riscv/stage1-lp64.spec b/releases/specs-qemu/riscv/stage1-lp64.spec
similarity index 100%
rename from releases/specs/riscv/stage1-lp64.spec
rename to releases/specs-qemu/riscv/stage1-lp64.spec
diff --git a/releases/specs/riscv/stage1-lp64d-systemd.spec b/releases/specs-qemu/riscv/stage1-lp64d-systemd.spec
similarity index 100%
rename from releases/specs/riscv/stage1-lp64d-systemd.spec
rename to releases/specs-qemu/riscv/stage1-lp64d-systemd.spec
diff --git a/releases/specs/riscv/stage1-lp64d.spec b/releases/specs-qemu/riscv/stage1-lp64d.spec
similarity index 100%
rename from releases/specs/riscv/stage1-lp64d.spec
rename to releases/specs-qemu/riscv/stage1-lp64d.spec
diff --git a/releases/specs/riscv/stage1-multilib.spec b/releases/specs-qemu/riscv/stage1-multilib.spec
similarity index 100%
rename from releases/specs/riscv/stage1-multilib.spec
rename to releases/specs-qemu/riscv/stage1-multilib.spec
diff --git a/releases/specs/riscv/stage2-ilp32.spec b/releases/specs-qemu/riscv/stage2-ilp32.spec
similarity index 100%
rename from releases/specs/riscv/stage2-ilp32.spec
rename to releases/specs-qemu/riscv/stage2-ilp32.spec
diff --git a/releases/specs/riscv/stage2-lp64-systemd.spec b/releases/specs-qemu/riscv/stage2-lp64-systemd.spec
similarity index 100%
rename from releases/specs/riscv/stage2-lp64-systemd.spec
rename to releases/specs-qemu/riscv/stage2-lp64-systemd.spec
diff --git a/releases/specs/riscv/stage2-lp64.spec b/releases/specs-qemu/riscv/stage2-lp64.spec
similarity index 100%
rename from releases/specs/riscv/stage2-lp64.spec
rename to releases/specs-qemu/riscv/stage2-lp64.spec
diff --git a/releases/specs/riscv/stage2-lp64d-systemd.spec b/releases/specs-qemu/riscv/stage2-lp64d-systemd.spec
similarity index 100%
rename from releases/specs/riscv/stage2-lp64d-systemd.spec
rename to releases/specs-qemu/riscv/stage2-lp64d-systemd.spec
diff --git a/releases/specs/riscv/stage2-lp64d.spec b/releases/specs-qemu/riscv/stage2-lp64d.spec
similarity index 100%
rename from releases/specs/riscv/stage2-lp64d.spec
rename to releases/specs-qemu/riscv/stage2-lp64d.spec
diff --git a/releases/specs/riscv/stage2-multilib.spec b/releases/specs-qemu/riscv/stage2-multilib.spec
similarity index 100%
rename from releases/specs/riscv/stage2-multilib.spec
rename to releases/specs-qemu/riscv/stage2-multilib.spec
diff --git a/releases/specs/riscv/stage3-ilp32.spec b/releases/specs-qemu/riscv/stage3-ilp32.spec
similarity index 100%
rename from releases/specs/riscv/stage3-ilp32.spec
rename to releases/specs-qemu/riscv/stage3-ilp32.spec
diff --git a/releases/specs/riscv/stage3-lp64-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64-systemd.spec
similarity index 100%
rename from releases/specs/riscv/stage3-lp64-systemd.spec
rename to releases/specs-qemu/riscv/stage3-lp64-systemd.spec
diff --git a/releases/specs/riscv/stage3-lp64.spec b/releases/specs-qemu/riscv/stage3-lp64.spec
similarity index 100%
rename from releases/specs/riscv/stage3-lp64.spec
rename to releases/specs-qemu/riscv/stage3-lp64.spec
diff --git a/releases/specs/riscv/stage3-lp64d-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
similarity index 100%
rename from releases/specs/riscv/stage3-lp64d-systemd.spec
rename to releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
diff --git a/releases/specs/riscv/stage3-lp64d.spec b/releases/specs-qemu/riscv/stage3-lp64d.spec
similarity index 100%
rename from releases/specs/riscv/stage3-lp64d.spec
rename to releases/specs-qemu/riscv/stage3-lp64d.spec
diff --git a/releases/specs/riscv/stage3-multilib.spec b/releases/specs-qemu/riscv/stage3-multilib.spec
similarity index 100%
rename from releases/specs/riscv/stage3-multilib.spec
rename to releases/specs-qemu/riscv/stage3-multilib.spec
diff --git a/tools/catalyst-auto-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
similarity index 92%
rename from tools/catalyst-auto-riscv.conf
rename to tools/catalyst-auto-qemu-riscv.conf
index 6a7e8657..f1d54001 100644
--- a/tools/catalyst-auto-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -4,7 +4,7 @@
 ARCH="riscv"
 host=$(hostname)
 
-SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
+SPECS_DIR=${REPO_DIR}/releases/specs-qemu/${ARCH}
 
 SETS="
 	multilib
@@ -12,9 +12,12 @@ SETS="
 	lp64
 	lp64d_systemd
 	lp64_systemd
-	ilp32
 "
 
+# riscv32 does not work yet
+#	ilp32
+
+
 SET_multilib_SPECS="stage1-multilib.spec stage2-multilib.spec stage3-multilib.spec"
 SET_lp64d_SPECS="stage1-lp64d.spec stage2-lp64d.spec stage3-lp64d.spec"
 SET_lp64_SPECS="stage1-lp64.spec stage2-lp64.spec stage3-lp64.spec"
@@ -22,8 +25,6 @@ SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage2-lp64d-systemd.spec sta
 SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage2-lp64-systemd.spec stage3-lp64-systemd.spec"
 SET_ilp32_SPECS="stage1-ilp32.spec stage2-ilp32.spec stage3-ilp32.spec"
 
-#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
-
 update_symlinks() {
 	# Symlink the latest stages3 to build from
 	local d f
@@ -50,7 +51,7 @@ post_build() {
 	pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
 
 	case ${spec} in
-		stage3*.spec)
+		stage3*lp*.spec)
 			upload stage3-$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
 			;;
 	esac