diff --git a/java-21-openjdk-portable.spec b/java-21-openjdk-portable.spec
index b62b575..238554f 100644
--- a/java-21-openjdk-portable.spec
+++ b/java-21-openjdk-portable.spec
@@ -151,7 +151,7 @@
 # Set of architectures for which we build the Z garbage collector
 %global zgc_arches x86_64 riscv64
 # Set of architectures for which alt-java has SSB mitigation
-%global ssbd_arches x86_64 riscv64
+%global ssbd_arches x86_64
 # Set of architectures for which java has short vector math library (libjsvml.so)
 %global svml_arches x86_64 riscv64
 # Set of architectures where we verify backtraces with gdb
@@ -567,7 +567,7 @@ ExcludeArch: %{ix86}
 
 Name:    java-%{javaver}-%{origin}-portable%{?pkgos:-%{pkgos}}
 Version: %{newjavaver}.%{buildver}
-Release: %{?eaprefix}%{rpmrelease}%{?extraver}.0.riscv64%{?dist}
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}.1.riscv64%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
 # also included the epoch in their virtual provides. This created a
@@ -1788,6 +1788,9 @@ done
 %endif
 
 %changelog
+* Mon Mar 11 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1:21.0.2.0.13-3.1.riscv64
+- Remove riscv64 from ssbd arches
+
 * Fri Mar 08 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1:21.0.2.0.13-3.0.riscv64
 - Add riscv64