diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index 3881174..9cc361e 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -119,15 +119,15 @@
 # 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
 # Set of architectures for which java has short vector math library (libsvml.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)
-%global gdb_arches %{arm} %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 %{zero_arches} riscv64
+%global gdb_arches %{arm} %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 %{zero_arches}
 %else
 %global gdb_arches %{jit_arches} %{zero_arches}
 %endif
@@ -256,7 +256,7 @@
 %global archinstall aarch64
 %global stapinstall arm64
 %endif
-%ifarch risv64
+%ifarch riscv64
 %global archinstall riscv64
 %global stapinstall riscv64
 %endif