diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index d6fed219..a1ebcf8e 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -51,16 +51,19 @@ update_symlinks() {
 post_build() {
 	local set=$1 spec=$2
 
-	pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
-
 	case ${spec} in
-		stage3*lp64*.spec)
+		stage3*lp64*20.0*.spec)
+			pushd "${BUILD_SRCDIR_BASE}/builds/20.0" >/dev/null
 			upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
+			popd >/dev/null
+			;;
+		stage3*lp64*.spec)
+			pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+			upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
+			popd >/dev/null
+			;;
+		*)
+			echo "Finished ${spec}"
 			;;
-	*)
-		echo "Finished ${spec}"
-		;;
 	esac
-
-	popd >/dev/null
 }