diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index 9cc361e..beff8aa 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -258,7 +258,7 @@
 %endif
 %ifarch riscv64
 %global archinstall riscv64
-%global stapinstall riscv64
+%global stapinstall %{_target_cpu}
 %endif
 # 32 bit sparc, optimized for v9
 %ifarch sparcv9
@@ -2420,7 +2420,7 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
-* Fri Mar 08 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1:21.0.2.0.13-2.0.riscv64
+* Tue Mar 12 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1:21.0.2.0.13-2.0.riscv64
 - Add riscv64
 
 * Thu Feb 15 2024 Petra Alice Mikova <pmikova@redhat.com> - 1:21.0.2.0.13-2