diff --git a/java-21-openjdk-portable.spec b/java-21-openjdk-portable.spec
index 9e519de..3175656 100644
--- a/java-21-openjdk-portable.spec
+++ b/java-21-openjdk-portable.spec
@@ -127,9 +127,9 @@
 # Set of architectures which support multiple ABIs
 %global multilib_arches %{power64} sparc64 x86_64
 # Set of architectures for which we build slowdebug builds
-%global debug_arches    %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x
+%global debug_arches    %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x riscv64
 # Set of architectures for which we build fastdebug builds
-%global fastdebug_arches x86_64 ppc64le aarch64
+%global fastdebug_arches x86_64 ppc64le aarch64 riscv64
 # Set of architectures with a Just-In-Time (JIT) compiler
 %global jit_arches      %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 riscv64
 # Set of architectures which use the Zero assembler port (!jit_arches)
@@ -149,11 +149,11 @@
 # Set of architectures for which we build the Shenandoah garbage collector
 %global shenandoah_arches x86_64 %{aarch64} riscv64
 # Set of architectures for which we build the Z garbage collector
-%global zgc_arches x86_64
+%global zgc_arches x86_64 riscv64
 # Set of architectures for which alt-java has SSB mitigation
-%global ssbd_arches x86_64
+%global ssbd_arches x86_64 riscv64
 # Set of architectures for which java has short vector math library (libjsvml.so)
-%global svml_arches x86_64
+%global svml_arches x86_64 riscv64
 # Set of architectures where we verify backtraces with gdb
 # s390x fails on RHEL 7 so we exclude it there
 %if (0%{?rhel} > 0 && 0%{?rhel} < 8)
@@ -306,7 +306,7 @@
 %endif
 %ifarch riscv64
 %global archinstall riscv64
-%global stapinstall riscv64
+%global stapinstall %{_target_cpu}
 %endif
 # 32 bit sparc, optimized for v9
 %ifarch sparcv9